mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-13 16:57:35 +00:00
Merge master into haskell-updates
This commit is contained in:
commit
4f3b5848de
10
.github/CODEOWNERS
vendored
10
.github/CODEOWNERS
vendored
@ -23,7 +23,7 @@
|
||||
|
||||
# Libraries
|
||||
/lib @edolstra @infinisil
|
||||
/lib/systems @alyssais @ericson2314 @matthewbauer
|
||||
/lib/systems @alyssais @ericson2314 @matthewbauer @amjoseph-nixpkgs
|
||||
/lib/generators.nix @edolstra @Profpatsch
|
||||
/lib/cli.nix @edolstra @Profpatsch
|
||||
/lib/debug.nix @edolstra @Profpatsch
|
||||
@ -37,10 +37,10 @@
|
||||
/pkgs/top-level/stage.nix @Ericson2314 @matthewbauer
|
||||
/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
|
||||
/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
|
||||
/pkgs/stdenv/generic @Ericson2314 @matthewbauer
|
||||
/pkgs/stdenv/generic @Ericson2314 @matthewbauer @amjoseph-nixpkgs
|
||||
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @matthewbauer @piegamesde
|
||||
/pkgs/stdenv/cross @Ericson2314 @matthewbauer
|
||||
/pkgs/build-support/cc-wrapper @Ericson2314
|
||||
/pkgs/stdenv/cross @Ericson2314 @matthewbauer @amjoseph-nixpkgs
|
||||
/pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs
|
||||
/pkgs/build-support/bintools-wrapper @Ericson2314
|
||||
/pkgs/build-support/setup-hooks @Ericson2314
|
||||
/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
|
||||
@ -124,7 +124,7 @@
|
||||
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
|
||||
|
||||
# C compilers
|
||||
/pkgs/development/compilers/gcc @matthewbauer
|
||||
/pkgs/development/compilers/gcc @matthewbauer @amjoseph-nixpkgs
|
||||
/pkgs/development/compilers/llvm @matthewbauer @RaitoBezarius
|
||||
|
||||
# Compatibility stuff
|
||||
|
@ -37,6 +37,10 @@ rec {
|
||||
config = "armv6l-unknown-linux-gnueabihf";
|
||||
} // platforms.raspberrypi;
|
||||
|
||||
bluefield2 = {
|
||||
config = "aarch64-unknown-linux-gnu";
|
||||
} // platforms.bluefield2;
|
||||
|
||||
remarkable1 = {
|
||||
config = "armv7l-unknown-linux-gnueabihf";
|
||||
} // platforms.zero-gravitas;
|
||||
|
@ -209,6 +209,14 @@ rec {
|
||||
# Legacy attribute, for compatibility with existing configs only.
|
||||
raspberrypi2 = armv7l-hf-multiplatform;
|
||||
|
||||
# Nvidia Bluefield 2 (w. crypto support)
|
||||
bluefield2 = {
|
||||
gcc = {
|
||||
arch = "armv8-a+fp+simd+crc+crypto";
|
||||
cpu = "cortex-a72";
|
||||
};
|
||||
};
|
||||
|
||||
zero-gravitas = {
|
||||
linux-kernel = {
|
||||
name = "zero-gravitas";
|
||||
|
@ -5630,6 +5630,12 @@
|
||||
githubId = 609279;
|
||||
name = "Isaac Shapira";
|
||||
};
|
||||
freyacodes = {
|
||||
email = "freya@arbjerg.dev";
|
||||
github = "freyacodes";
|
||||
githubId = 2582617;
|
||||
name = "Freya Arbjerg";
|
||||
};
|
||||
fricklerhandwerk = {
|
||||
email = "valentin@fricklerhandwerk.de";
|
||||
github = "fricklerhandwerk";
|
||||
@ -13016,6 +13022,12 @@
|
||||
githubId = 1830959;
|
||||
name = "Piper McCorkle";
|
||||
};
|
||||
piturnah = {
|
||||
email = "peterhebden6@gmail.com";
|
||||
github = "piturnah";
|
||||
githubId = 20472367;
|
||||
name = "Peter Hebden";
|
||||
};
|
||||
pjbarnoy = {
|
||||
email = "pjbarnoy@gmail.com";
|
||||
github = "pjbarnoy";
|
||||
|
@ -82,6 +82,8 @@
|
||||
|
||||
- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually.
|
||||
|
||||
- The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147).
|
||||
|
||||
## Other Notable Changes {#sec-release-23.11-notable-changes}
|
||||
|
||||
- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
|
||||
|
@ -646,6 +646,7 @@
|
||||
./services/misc/greenclip.nix
|
||||
./services/misc/headphones.nix
|
||||
./services/misc/heisenbridge.nix
|
||||
./services/misc/homepage-dashboard.nix
|
||||
./services/misc/ihaskell.nix
|
||||
./services/misc/input-remapper.nix
|
||||
./services/misc/irkerd.nix
|
||||
|
55
nixos/modules/services/misc/homepage-dashboard.nix
Normal file
55
nixos/modules/services/misc/homepage-dashboard.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ config
|
||||
, pkgs
|
||||
, lib
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.homepage-dashboard;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.homepage-dashboard = {
|
||||
enable = lib.mkEnableOption (lib.mdDoc "Homepage Dashboard");
|
||||
|
||||
package = lib.mkPackageOptionMD pkgs "homepage-dashboard" { };
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc "Open ports in the firewall for Homepage.";
|
||||
};
|
||||
|
||||
listenPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 8082;
|
||||
description = lib.mdDoc "Port for Homepage to bind to.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.homepage-dashboard = {
|
||||
description = "Homepage Dashboard";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
environment = {
|
||||
HOMEPAGE_CONFIG_DIR = "/var/lib/homepage-dashboard";
|
||||
PORT = "${toString cfg.listenPort}";
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
StateDirectory = "homepage-dashboard";
|
||||
ExecStart = "${lib.getExe cfg.package}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall = lib.mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ cfg.listenPort ];
|
||||
};
|
||||
};
|
||||
}
|
@ -11,6 +11,8 @@ in
|
||||
services.prowlarr = {
|
||||
enable = mkEnableOption (lib.mdDoc "Prowlarr");
|
||||
|
||||
package = mkPackageOptionMD pkgs "prowlarr" { };
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
@ -29,7 +31,7 @@ in
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
StateDirectory = "prowlarr";
|
||||
ExecStart = "${pkgs.prowlarr}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr";
|
||||
ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
|
@ -14,7 +14,9 @@ let
|
||||
# taken from https://github.com/python/cpython/blob/05cb728d68a278d11466f9a6c8258d914135c96c/Lib/re.py#L251-L266
|
||||
special = [
|
||||
"(" ")" "[" "]" "{" "}" "?" "*" "+" "-" "|" "^" "$" "\\" "." "&" "~"
|
||||
"#" " " "\t" "\n" "\r" "\v" "\f"
|
||||
"#" " " "\t" "\n" "\r"
|
||||
"" # \v / 0x0B
|
||||
"" # \f / 0x0C
|
||||
];
|
||||
in
|
||||
replaceStrings special (map (c: "\\${c}") special);
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ config, lib, pkgs, buildEnv, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.peering-manager;
|
||||
configFile = pkgs.writeTextFile {
|
||||
@ -41,24 +39,24 @@ let
|
||||
pkg = (pkgs.peering-manager.overrideAttrs (old: {
|
||||
postInstall = ''
|
||||
ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py
|
||||
'' + optionalString cfg.enableLdap ''
|
||||
'' + lib.optionalString cfg.enableLdap ''
|
||||
ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py
|
||||
'';
|
||||
})).override {
|
||||
inherit (cfg) plugins;
|
||||
};
|
||||
peeringManagerManageScript = with pkgs; (writeScriptBin "peering-manager-manage" ''
|
||||
#!${stdenv.shell}
|
||||
peeringManagerManageScript = pkgs.writeScriptBin "peering-manager-manage" ''
|
||||
#!${pkgs.stdenv.shell}
|
||||
export PYTHONPATH=${pkg.pythonPath}
|
||||
sudo -u peering-manager ${pkg}/bin/peering-manager "$@"
|
||||
'');
|
||||
'';
|
||||
|
||||
in {
|
||||
options.services.peering-manager = {
|
||||
options.services.peering-manager = with lib; {
|
||||
enable = mkOption {
|
||||
type = lib.types.bool;
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Enable Peering Manager.
|
||||
|
||||
This module requires a reverse proxy that serves `/static` separately.
|
||||
@ -69,7 +67,7 @@ in {
|
||||
listenAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "[::1]";
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Address the server will listen on.
|
||||
'';
|
||||
};
|
||||
@ -77,7 +75,7 @@ in {
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8001;
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Port the server will listen on.
|
||||
'';
|
||||
};
|
||||
@ -88,14 +86,14 @@ in {
|
||||
defaultText = literalExpression ''
|
||||
python3Packages: with python3Packages; [];
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
List of plugin packages to install.
|
||||
'';
|
||||
};
|
||||
|
||||
secretKeyFile = mkOption {
|
||||
type = types.path;
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Path to a file containing the secret key.
|
||||
'';
|
||||
};
|
||||
@ -103,7 +101,7 @@ in {
|
||||
peeringdbApiKeyFile = mkOption {
|
||||
type = with types; nullOr path;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Path to a file containing the PeeringDB API key.
|
||||
'';
|
||||
};
|
||||
@ -111,7 +109,7 @@ in {
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Additional lines of configuration appended to the `configuration.py`.
|
||||
See the [documentation](https://peering-manager.readthedocs.io/en/stable/configuration/optional-settings/) for more possible options.
|
||||
'';
|
||||
@ -120,7 +118,7 @@ in {
|
||||
enableLdap = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Enable LDAP-Authentication for Peering Manager.
|
||||
|
||||
This requires a configuration file being pass through `ldapConfigPath`.
|
||||
@ -129,15 +127,15 @@ in {
|
||||
|
||||
ldapConfigPath = mkOption {
|
||||
type = types.path;
|
||||
description = lib.mdDoc ''
|
||||
description = mdDoc ''
|
||||
Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`.
|
||||
See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.peering-manager.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]);
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.peering-manager.plugins = lib.mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]);
|
||||
|
||||
system.build.peeringManagerPkg = pkg;
|
||||
|
||||
@ -262,4 +260,6 @@ in {
|
||||
users.groups.peering-manager = {};
|
||||
users.groups."${config.services.redis.servers.peering-manager.user}".members = [ "peering-manager" ];
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ yuka ];
|
||||
}
|
||||
|
@ -24,12 +24,12 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [ {
|
||||
assertion = pkgs.stdenv.hostPlatform.isx86;
|
||||
assertion = pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isAarch64;
|
||||
message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}";
|
||||
} ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "mptspi" ];
|
||||
boot.initrd.kernelModules = [ "vmw_pvscsi" ];
|
||||
boot.initrd.kernelModules = lib.optionals pkgs.stdenv.hostPlatform.isx86 [ "vmw_pvscsi" ];
|
||||
|
||||
environment.systemPackages = [ open-vm-tools ];
|
||||
|
||||
|
@ -337,6 +337,7 @@ in {
|
||||
hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; };
|
||||
hedgedoc = handleTest ./hedgedoc.nix {};
|
||||
herbstluftwm = handleTest ./herbstluftwm.nix {};
|
||||
homepage-dashboard = handleTest ./homepage-dashboard.nix {};
|
||||
installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});
|
||||
invidious = handleTest ./invidious.nix {};
|
||||
oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
|
||||
|
14
nixos/tests/homepage-dashboard.nix
Normal file
14
nixos/tests/homepage-dashboard.nix
Normal file
@ -0,0 +1,14 @@
|
||||
import ./make-test-python.nix ({ lib, ... }: {
|
||||
name = "homepage-dashboard";
|
||||
meta.maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: {
|
||||
services.homepage-dashboard.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("homepage-dashboard.service")
|
||||
machine.wait_for_open_port(8082)
|
||||
machine.succeed("curl --fail http://localhost:8082/")
|
||||
'';
|
||||
})
|
@ -32,6 +32,7 @@ let
|
||||
linux_5_15_hardened
|
||||
linux_6_1_hardened
|
||||
linux_6_3_hardened
|
||||
linux_6_4_hardened
|
||||
|
||||
linux_testing;
|
||||
};
|
||||
|
@ -34,7 +34,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
"sudo -u postgres psql -c 'ALTER USER \"peering-manager\" WITH SUPERUSER;'"
|
||||
)
|
||||
machine.succeed(
|
||||
"cd ${nodes.machine.config.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input"
|
||||
"cd ${nodes.machine.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
@ -9,16 +9,16 @@ let
|
||||
|
||||
in buildGoModule rec {
|
||||
pname = "go-ethereum";
|
||||
version = "1.11.6";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mZ11xan3MGgaUORbiQczKrXSrxzjvQMhZbpHnEal11Y=";
|
||||
sha256 = "sha256-u1p9k12tY79kA/2Hu109czQZnurHuDJQf/w7J0c8SuU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rjSGR2ie5sFK2OOo4HUZ6+hrDlQuUDtyTKn0sh8jFBY=";
|
||||
vendorHash = "sha256-k5MbOiJDvWFnaAPViNRHeqFa64XPZ3ImkkvkmTTscNA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -33,7 +33,6 @@ in buildGoModule rec {
|
||||
"cmd/abidump"
|
||||
"cmd/abigen"
|
||||
"cmd/bootnode"
|
||||
"cmd/checkpoint-admin"
|
||||
"cmd/clef"
|
||||
"cmd/devp2p"
|
||||
"cmd/ethkey"
|
||||
@ -58,6 +57,6 @@ in buildGoModule rec {
|
||||
homepage = "https://geth.ethereum.org/";
|
||||
description = "Official golang implementation of the Ethereum protocol";
|
||||
license = with licenses; [ lgpl3Plus gpl3Plus ];
|
||||
maintainers = with maintainers; [ adisbladis RaghavSood ];
|
||||
maintainers = with maintainers; [ RaghavSood ];
|
||||
};
|
||||
}
|
||||
|
@ -77,8 +77,6 @@ let
|
||||
--replace-needed libcrypto.so.10 libcrypto.so
|
||||
|
||||
autoPatchelf $PWD/bin
|
||||
wrapProgram $out/bin/clion \
|
||||
--set CL_JDK "${jdk}"
|
||||
)
|
||||
'';
|
||||
});
|
||||
|
@ -71,6 +71,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
|
||||
}
|
||||
|
||||
rm -rf jbr
|
||||
# When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk
|
||||
ln -s ${jdk.home} jbr
|
||||
|
||||
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
|
||||
if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
|
||||
|
@ -1385,6 +1385,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/";
|
||||
};
|
||||
|
||||
cmp-beancount = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-beancount";
|
||||
version = "2022-11-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "crispgm";
|
||||
repo = "cmp-beancount";
|
||||
rev = "da154ea94d598e6649d6ad01efa0a8611eff460d";
|
||||
sha256 = "14y2h8g5ddcf2rqwgrrsk8m3j4wmk26vdlqzx439n893dzmzd2yg";
|
||||
};
|
||||
meta.homepage = "https://github.com/crispgm/cmp-beancount/";
|
||||
};
|
||||
|
||||
cmp-buffer = buildVimPluginFrom2Nix {
|
||||
pname = "cmp-buffer";
|
||||
version = "2022-08-10";
|
||||
|
@ -115,6 +115,7 @@ https://github.com/bbchung/clighter8/,,
|
||||
https://github.com/ekickx/clipboard-image.nvim/,,
|
||||
https://github.com/asheq/close-buffers.vim/,HEAD,
|
||||
https://github.com/winston0410/cmd-parser.nvim/,,
|
||||
https://github.com/crispgm/cmp-beancount/,HEAD,
|
||||
https://github.com/hrsh7th/cmp-buffer/,,
|
||||
https://github.com/hrsh7th/cmp-calc/,,
|
||||
https://github.com/vappolinario/cmp-clippy/,HEAD,
|
||||
|
@ -2195,12 +2195,37 @@ let
|
||||
};
|
||||
|
||||
mgt19937.typst-preview = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
mktplcRef =
|
||||
let
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
sha256 = "sha256-O8sFv23tlhJS6N8LRKkHcTJTupZejCLDRdVVCdDlWbA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
sha256 = "1npzjch67agswh3nm14dbbsx777daq2rdw1yny10jf3858z2qynr";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
sha256 = "1vv1jfgnyjbmshh4w6rf496d9dpdsk3f0049ii4d9vi23igk4xpk";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
sha256 = "0dfchzqm61kddq20zvp1pcpk1625b9wgj32ymc08piq06pbadk29";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "typst-preview";
|
||||
publisher = "mgt19937";
|
||||
version = "0.6.0";
|
||||
sha256 = "sha256-ZrsTtbD3oIUjxSC1osGYwTynwvDFQxuGeDglopBJGxA=";
|
||||
};
|
||||
version = "0.6.1";
|
||||
} // sources.${stdenv.system};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ];
|
||||
|
||||
meta = {
|
||||
description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";
|
||||
|
@ -34,8 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
preFixup = ''
|
||||
wrapQtApp "$out/bin/fs-uae-launcher" \
|
||||
--set PYTHONPATH "$PYTHONPATH" \
|
||||
--prefix PATH : ${lib.makeBinPath [ fsuae ]}
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
|
||||
# fs-uae-launcher search side by side for fs-uae
|
||||
# see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable
|
||||
ln -s ${fsuae}/bin/fs-uae $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -28,13 +28,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.958"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.960"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "fa32ef92755a51a2567a1bcbb35fb34886b5f979";
|
||||
sha256 = "1g7q5c4cx2l41vs92p6a8rw1c0wvrydm9p962mjddckk6hf1bixq";
|
||||
rev = "ac2444f908bee5b5c1a13fe64e997315cea4b23c";
|
||||
sha256 = "0nv55x775lzbqa724ba2bpbkk6r7jbrgxgbir5bhyj0yz5ckl4v5";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
@ -18,12 +18,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "visualboyadvance-m";
|
||||
version = "2.1.5";
|
||||
version = "2.1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "visualboyadvance-m";
|
||||
repo = "visualboyadvance-m";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sc3gdn7dqkipjsvlzchgd98mia9ic11169dw8v341vr9ppb1b6m";
|
||||
sha256 = "1fph8phbswq6d9lgw1y1767wdp316w5hn5bws6h2dj75gvsqf221";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
@ -43,13 +43,6 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/1d7e8ae4edc53a3380dfea88329b8b8337db1c52.patch";
|
||||
sha256 = "sha256-SV1waz2JSKiM6itwkqwlE3aOZCcOl8iyBr06tyYlefo=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE='Release'"
|
||||
"-DENABLE_FFMPEG='true'"
|
||||
|
@ -1,10 +1,38 @@
|
||||
{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
|
||||
, cairo, readline, ffmpeg, makeWrapper, wxGTK32, libiconv, libxml2, netcdf, blas
|
||||
, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, proj-datumgrid
|
||||
, zstd, pdal, wrapGAppsHook
|
||||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, wrapGAppsHook
|
||||
|
||||
, bison
|
||||
, blas
|
||||
, cairo
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, flex
|
||||
, gdal
|
||||
, geos
|
||||
, libiconv
|
||||
, libmysqlclient
|
||||
, libpng
|
||||
, libtiff
|
||||
, libxml2
|
||||
, netcdf
|
||||
, pdal
|
||||
, pkg-config
|
||||
, postgresql
|
||||
, proj
|
||||
, proj-datumgrid
|
||||
, python3Packages
|
||||
, readline
|
||||
, sqlite
|
||||
, wxGTK32
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "grass";
|
||||
version = "8.3.0";
|
||||
|
||||
@ -16,22 +44,39 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config bison flex makeWrapper wrapGAppsHook
|
||||
makeWrapper
|
||||
wrapGAppsHook
|
||||
|
||||
bison
|
||||
flex
|
||||
gdal # for `gdal-config`
|
||||
geos # for `geos-config`
|
||||
netcdf # for `nc-config`
|
||||
libmysqlclient # for `mysql_config`
|
||||
netcdf # for `nc-config`
|
||||
pkg-config
|
||||
] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);
|
||||
|
||||
buildInputs = [
|
||||
cairo zlib proj libtiff libpng libxml2 fftw sqlite
|
||||
readline ffmpeg postgresql blas wxGTK32
|
||||
proj-datumgrid zstd
|
||||
blas
|
||||
cairo
|
||||
ffmpeg
|
||||
fftw
|
||||
gdal
|
||||
geos
|
||||
netcdf
|
||||
libmysqlclient
|
||||
libpng
|
||||
libtiff
|
||||
libxml2
|
||||
netcdf
|
||||
pdal
|
||||
postgresql
|
||||
proj
|
||||
proj-datumgrid
|
||||
readline
|
||||
sqlite
|
||||
wxGTK32
|
||||
zlib
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
strictDeps = true;
|
||||
@ -46,24 +91,24 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-proj-share=${proj}/share/proj"
|
||||
"--with-proj-includes=${proj.dev}/include"
|
||||
"--with-proj-libs=${proj}/lib"
|
||||
"--without-opengl"
|
||||
"--with-readline"
|
||||
"--with-wxwidgets"
|
||||
"--with-netcdf"
|
||||
"--with-blas"
|
||||
"--with-fftw"
|
||||
"--with-geos"
|
||||
"--with-postgres"
|
||||
"--with-postgres-libs=${postgresql.lib}/lib/"
|
||||
# it complains about missing libmysqld but doesn't really seem to need it
|
||||
# It complains about missing libmysqld but doesn't really seem to need it
|
||||
"--with-mysql"
|
||||
"--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql"
|
||||
"--with-mysql-libs=${libmysqlclient}/lib/mysql"
|
||||
"--with-blas"
|
||||
"--with-zstd"
|
||||
"--with-fftw"
|
||||
"--with-netcdf"
|
||||
"--with-postgres"
|
||||
"--with-postgres-libs=${postgresql.lib}/lib/"
|
||||
"--with-proj-includes=${proj.dev}/include"
|
||||
"--with-proj-libs=${proj}/lib"
|
||||
"--with-proj-share=${proj}/share/proj"
|
||||
"--with-pthread"
|
||||
"--with-readline"
|
||||
"--with-wxwidgets"
|
||||
"--with-zstd"
|
||||
"--without-opengl"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"--with-pdal"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
@ -96,11 +141,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests = {
|
||||
grass = callPackage ./tests.nix { grass = finalAttrs.finalPackage; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://grass.osgeo.org/";
|
||||
description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
|
||||
homepage = "https://grass.osgeo.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
18
pkgs/applications/gis/grass/tests.nix
Normal file
18
pkgs/applications/gis/grass/tests.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ runCommand, grass }:
|
||||
|
||||
let
|
||||
inherit (grass) pname version;
|
||||
|
||||
in
|
||||
runCommand "${pname}-tests" { meta.timeout = 60; }
|
||||
''
|
||||
HOME=$(mktemp -d)
|
||||
|
||||
${grass}/bin/grass --tmp-location EPSG:3857 --exec g.version \
|
||||
| grep 'GRASS ${version}'
|
||||
|
||||
${grass}/bin/grass --tmp-location EPSG:3857 --exec g.mapset -l \
|
||||
| grep 'PERMANENT'
|
||||
|
||||
touch $out
|
||||
''
|
@ -58,12 +58,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "8887fc34abd97c4998b0888c3197e0c509d63bdeab2238906915319811f3b080";
|
||||
sha256 = "e043d38d2e8adb67af7690b12b535a40e8ec7bea05cfa8684db8b21a626e0f0d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
@ -147,6 +147,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.darktable.org";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits ];
|
||||
maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits freyacodes ];
|
||||
};
|
||||
}
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.21.1";
|
||||
version = "1.22.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1VqV0tTI8XVwGJhaGWEdSxtWDhQFmrsncvhC4ftJ7Jg=";
|
||||
hash = "sha256-6Pqa3qNnH8WF/GK4CLyEmLoPm4A6Q3Gri2x0whf6WTY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
56
pkgs/applications/graphics/komorebi/default.nix
Normal file
56
pkgs/applications/graphics/komorebi/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, vala
|
||||
, pkg-config
|
||||
, glib
|
||||
, gtk3
|
||||
, libgee
|
||||
, webkitgtk
|
||||
, clutter-gtk
|
||||
, clutter-gst
|
||||
, ninja
|
||||
, wrapGAppsHook
|
||||
, testers
|
||||
, komorebi
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "komorebi";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Komorebi-Fork";
|
||||
repo = "komorebi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
vala
|
||||
pkg-config
|
||||
ninja
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libgee
|
||||
webkitgtk
|
||||
clutter-gtk
|
||||
clutter-gst
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = komorebi; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A beautiful and customizable wallpaper manager for Linux";
|
||||
homepage = "https://github.com/Komorebi-Fork/komorebi";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ kranzes ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
38
pkgs/applications/misc/johnny-reborn/default.nix
Normal file
38
pkgs/applications/misc/johnny-reborn/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, SDL2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "johnny-reborn-engine";
|
||||
version = "unstable-2020-12-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jno6809";
|
||||
repo = "jc_reborn";
|
||||
rev = "524a5803e4fa65f840379c781f40ce39a927032e";
|
||||
hash = "sha256-YKAOCgdRnvNMzL6LJVXN0pLvjyJk4Zv/RCqGtDPFR90=";
|
||||
};
|
||||
|
||||
makefile = "Makefile.linux";
|
||||
|
||||
buildInputs = [ SDL2 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp jc_reborn $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (engine only)";
|
||||
homepage = "https://github.com/jno6809/jc_reborn";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ pedrohlc ];
|
||||
inherit (SDL2.meta) platforms;
|
||||
};
|
||||
}
|
63
pkgs/applications/misc/johnny-reborn/with-data.nix
Normal file
63
pkgs/applications/misc/johnny-reborn/with-data.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, johnny-reborn-engine
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "johnny-reborn";
|
||||
inherit (johnny-reborn-engine) version;
|
||||
|
||||
srcs =
|
||||
let
|
||||
sounds = fetchFromGitHub {
|
||||
owner = "nivs1978";
|
||||
repo = "Johnny-Castaway-Open-Source";
|
||||
rev = "be6afefd43a3334acc66fc9d777c162c8bfb9558";
|
||||
hash = "sha256-rtZVCn4KbEBVwaSQ4HZhMoDEI5Q9IPj9SZywgAx0MPY=";
|
||||
};
|
||||
|
||||
resources = fetchzip {
|
||||
name = "scrantic-source";
|
||||
url = "https://archive.org/download/johnny-castaway-screensaver/scrantic-run.zip";
|
||||
hash = "sha256-Q9chCYReOQEmkTyIkYo+D+OXYUqxPNOOEEmiFh8yaw4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
in
|
||||
[
|
||||
sounds
|
||||
resources
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
sourceRoot = "source";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -t $out/ \
|
||||
../scrantic-source/RESOURCE.* \
|
||||
JCOS/Resources/sound*.wav
|
||||
|
||||
makeWrapper \
|
||||
${johnny-reborn-engine}/jc_reborn \
|
||||
$out/jc_reborn \
|
||||
--chdir $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (ready to use, with resources)";
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ pedrohlc ];
|
||||
inherit (johnny-reborn-engine.meta) homepage platforms;
|
||||
};
|
||||
}
|
@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "otpclient";
|
||||
version = "3.1.8";
|
||||
version = "3.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paolostivanin";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wwK8JI/IP89aRmetUXE+RlrqU8bpfIkzMZ9nF7qFe1Q=";
|
||||
hash = "sha256-FSXUqnES/YxONwLza4N2C4Ks02OOfRaXHbdBxr85sFg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,15 +1,15 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "1.4.12";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TandoorRecipes";
|
||||
repo = "recipes";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZGPXcpicDYCE+J9mC2Dk/Ds2NYfUETuKXqHxpAGH86w=";
|
||||
sha256 = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA=";
|
||||
};
|
||||
|
||||
yarnSha256 = "sha256-LJ0uL66tcK6zL8Mkd2UB8dHsslMTtf8wQmgbZdvOT6s=";
|
||||
yarnSha256 = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tandoor.dev/";
|
||||
|
25
pkgs/applications/misc/tango/default.nix
Normal file
25
pkgs/applications/misc/tango/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tango";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "masakichi";
|
||||
repo = "tango";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e/M2iRm/UwfnRVnMo1PmQTkz4IGTxnsCXNSSUkhsiHk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-83nKtiEy1na1HgAQcbTEfl+0vGg6BkCLBK1REN9fP+k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A local command-line Japanese dictionary tool using yomichan's dictionary files";
|
||||
homepage = "https://github.com/masakichi/tango";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ donovanglover ];
|
||||
};
|
||||
}
|
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tui-journal";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AmmarAbouZor";
|
||||
repo = "tui-journal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B3GxxkFT2Z7WtV9RSmtKBjvzRRqmcoukUKc6LUZ/JyM=";
|
||||
hash = "sha256-4fa41kzDGefqxfCcxe1/9iEZHVC8MIzcOG8RUiLW5bw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DCKW8eGLSTx9U7mkGruPphzFpDlpL8ULCOKhj6HJwhw=";
|
||||
cargoHash = "sha256-Uz9Od9hXM6EGZ+MsZ7uCYvA4aoF3E9uSNjjtxd1ssCs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "tjournal";
|
||||
};
|
||||
}
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper
|
||||
, dpkg
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
@ -7,6 +6,7 @@
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, dpkg
|
||||
, expat
|
||||
, fontconfig
|
||||
, freetype
|
||||
@ -15,32 +15,33 @@
|
||||
, gnome
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, libuuid
|
||||
, libdrm
|
||||
, libX11
|
||||
, libXScrnSaver
|
||||
, libXcomposite
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXi
|
||||
, libxkbcommon
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXScrnSaver
|
||||
, libxshmfence
|
||||
, libXtst
|
||||
, libdrm
|
||||
, libkrb5
|
||||
, libuuid
|
||||
, libxkbcommon
|
||||
, libxshmfence
|
||||
, mesa
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, pipewire
|
||||
, snappy
|
||||
, udev
|
||||
, wayland
|
||||
, xdg-utils
|
||||
, xorg
|
||||
, zlib
|
||||
, xdg-utils
|
||||
, snappy
|
||||
|
||||
# command line arguments which are always set e.g "--disable-gpu"
|
||||
, commandLineArgs ? ""
|
||||
@ -73,7 +74,7 @@ let
|
||||
libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage
|
||||
libXext libXfixes libXi libXrandr libXrender libxshmfence
|
||||
libXtst libuuid mesa nspr nss pango pipewire udev wayland
|
||||
xorg.libxcb zlib snappy
|
||||
xorg.libxcb zlib snappy libkrb5
|
||||
]
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optional libvaSupport libva;
|
||||
|
@ -8,13 +8,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "7.2.4";
|
||||
version = "7.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LVDWgyIBVp7UVnEuQ42eVfxDZB3BZn5InnPX7WN6MrA=";
|
||||
sha256 = "sha256-o/JhfS2VkN5qzZglFN1YNSZV2A2LowNouQee4Tv2dFc=";
|
||||
};
|
||||
vendorHash = null;
|
||||
|
||||
|
@ -28,13 +28,13 @@
|
||||
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
|
||||
},
|
||||
"aiven": {
|
||||
"hash": "sha256-rmXfUMP1CWKV7ahxfmCr2FvWYcEWKh+V3fWSQWvcUDU=",
|
||||
"hash": "sha256-T9d1iMuFqewDVK4EOsF4uCsqZAsThMHaRa7ilGnYXCo=",
|
||||
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
|
||||
"owner": "aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v4.6.0",
|
||||
"rev": "v4.7.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-oUUl7m7+r10xSklrcsTYOU8wk8n7TLu6Qt50wTKLULk="
|
||||
"vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM="
|
||||
},
|
||||
"akamai": {
|
||||
"hash": "sha256-gQZ5yH3sV5DTpSE+/bZM12+PHitmUm/TtpAdPijF+Lk=",
|
||||
@ -110,29 +110,29 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-LFOlSmsnV7opt9Z3b15Lyi8sFYjx2WkvvB8vpJBjfWQ=",
|
||||
"hash": "sha256-VDet4IGyd0RXCzlQ+s08QwX9eby5oYfwq2eVRfSS9ME=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v5.7.0",
|
||||
"rev": "v5.8.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-x8f1sTVB1FaoPKgTGEoZaNVKCpNbTrQ7F0PVfwEWe/I="
|
||||
"vendorHash": "sha256-oNPWz/0jcSL0FYuIW9wnj8Jp94vm9dJdiC9gfhtbQiU="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",
|
||||
"hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.39.0",
|
||||
"rev": "v2.40.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-PwAwVpLoMq5DNIiY5wt+n9oqNGInJ+C0JfiFagtrAEA=",
|
||||
"hash": "sha256-4cJal4GrL8OwoFNMjN0AKlicq2mC0ba3N8bYISMaY3A=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.64.0",
|
||||
"rev": "v3.65.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -182,13 +182,13 @@
|
||||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
},
|
||||
"buildkite": {
|
||||
"hash": "sha256-yxL08Eysj/w9uLmuqDKx1ZcYQZSy91pDgR84BdpsF88=",
|
||||
"hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=",
|
||||
"homepage": "https://registry.terraform.io/providers/buildkite/buildkite",
|
||||
"owner": "buildkite",
|
||||
"repo": "terraform-provider-buildkite",
|
||||
"rev": "v0.19.2",
|
||||
"rev": "v0.20.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-AJcPxiuglHpsHUIa5sJMtY7MRN5JrW/tfkz3+5Bv9AU="
|
||||
"vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I="
|
||||
},
|
||||
"checkly": {
|
||||
"hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=",
|
||||
@ -445,22 +445,22 @@
|
||||
"vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-2c50Ul57IeI7NzH0qYRIw8aKoB/5edCEsurc7JcojgQ=",
|
||||
"hash": "sha256-FlBTLc3QUsPAO1OIr8aOlb7ppePsAjtKKrBOTS+JYFI=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.73.0",
|
||||
"rev": "v4.73.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-2fiwPrmd/PHFNksfpo/TQQsuFz7RttAea5C8LJTrMAg=",
|
||||
"hash": "sha256-GYX0tmNut04NbpqbfXCy/5Rabn3leWf1VH+yGHTsCek=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.73.0",
|
||||
"rev": "v4.73.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A="
|
||||
},
|
||||
@ -700,11 +700,11 @@
|
||||
"vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ="
|
||||
},
|
||||
"lxd": {
|
||||
"hash": "sha256-qJp/RekJBsXx5Ic6J6CKs/oBcyqHB/sSjpzjAZUf2iE=",
|
||||
"hash": "sha256-mZ2ptpgpyNXZAS19MVxOq3cfmSjTJvTP60fbpEgk6kE=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
|
||||
"owner": "terraform-lxd",
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v1.10.0",
|
||||
"rev": "v1.10.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw="
|
||||
},
|
||||
@ -745,13 +745,13 @@
|
||||
"vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-z/bRdyXrjMn98DtQAnEuuJX4dr3SItbOQlvST/p7jCY=",
|
||||
"hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.10.0",
|
||||
"rev": "v1.10.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-QSRo/lloloaUtGTv8fauO+6biroTlIteM1KsadvFZtg="
|
||||
"vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI="
|
||||
},
|
||||
"namecheap": {
|
||||
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
|
||||
@ -863,20 +863,20 @@
|
||||
"vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI="
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-VPXuM1w6A/dNJcdpEQsi9wmp93urJclWN5jLMBme9h8=",
|
||||
"hash": "sha256-SM6WG7igvFlIbi5AYj/1JXxjbpGgBkz2dKUnR4ZjQb8=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.35.2",
|
||||
"rev": "v1.35.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-TKYKKw6Mrq7hhM+at9VAiVxIpjYeg7AmEIEzfDIJA5M="
|
||||
"vendorHash": "sha256-zlviJb2EYw/9NiD64xLFY8cd4H9Nb63tSbBUzFhW8Qo="
|
||||
},
|
||||
"opsgenie": {
|
||||
"hash": "sha256-3W53oONyPoXSp7fnB2EG512rBXac07nGVevdZ9gezig=",
|
||||
"hash": "sha256-fZidZFpusgO1PTXArsxn/omo+DC1nfVu6649BvBzj+k=",
|
||||
"homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
|
||||
"owner": "opsgenie",
|
||||
"repo": "terraform-provider-opsgenie",
|
||||
"rev": "v0.6.27",
|
||||
"rev": "v0.6.28",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -971,13 +971,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"scaleway": {
|
||||
"hash": "sha256-coscd4w+x7+Klp4j1Wb9z092WqWUhZTnREEq+RdgFLw=",
|
||||
"hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.23.0",
|
||||
"rev": "v2.24.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-8MjVOibZuPlZHP3fIIcr17Siz0VAZ5SX8TUpj5L/YXc="
|
||||
"vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0="
|
||||
},
|
||||
"secret": {
|
||||
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
|
||||
@ -1261,12 +1261,12 @@
|
||||
"vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="
|
||||
},
|
||||
"yandex": {
|
||||
"hash": "sha256-FsbwylRyUFDZ9n40D36bnchYCax9hKyDLTPF7UV85y4=",
|
||||
"hash": "sha256-03lZMLD2Iq9o9ijvMD7JNnaGNdn5OpB/s3509YdYRfQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
|
||||
"owner": "yandex-cloud",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.94.0",
|
||||
"rev": "v0.95.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-/HrijkUpJmeCjk6SCH2TE9MThjnimskOjztzRygd5fE="
|
||||
"vendorHash": "sha256-IdRgtPUAYYR55MiT/2wqGzYhuMfThUmhnGGYoPQlHW0="
|
||||
}
|
||||
}
|
||||
|
@ -1,18 +1,28 @@
|
||||
{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems
|
||||
, python3, pipewire, libpulseaudio, xdg-utils, electron_24, makeDesktopItem }:
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
, copyDesktopItems
|
||||
, python3
|
||||
, pipewire
|
||||
, libpulseaudio
|
||||
, xdg-utils
|
||||
, electron_25
|
||||
, makeDesktopItem
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-530iWNvehImwSYt5HnZaqa4TAslrwxAOZi3gRm1K2/w=";
|
||||
hash = "sha256-E/WXAVSCNTDEDaz71LXOHUf/APFO2uSpkTRhlZfQp0E=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-YguZtGn8CT4EqOQWS0GeNGBdZSC3Lj1gFR0ZiegWTJU=";
|
||||
npmDepsHash = "sha256-vGaYjM13seVmRbVPyDIM+qhGTCj6rw/el6Dq3KMzDks=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
@ -46,7 +56,7 @@ buildNpmPackage rec {
|
||||
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
|
||||
|
||||
# Add xdg-utils to path via suffix, per PR #181171
|
||||
makeWrapper '${electron_24}/bin/electron' $out/bin/webcord \
|
||||
makeWrapper '${electron_25}/bin/electron' $out/bin/webcord \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \
|
||||
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
|
||||
@ -66,6 +76,8 @@ buildNpmPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Discord and Fosscord electron-based client implemented without Discord API";
|
||||
homepage = "https://github.com/SpacingBat3/WebCord";
|
||||
@ -73,6 +85,6 @@ buildNpmPackage rec {
|
||||
changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ huantian ];
|
||||
platforms = electron_24.meta.platforms;
|
||||
platforms = electron_25.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
@ -2,8 +2,10 @@
|
||||
, substituteAll
|
||||
, lib
|
||||
, vencord-web-extension
|
||||
, electron_24
|
||||
}:
|
||||
webcord.overrideAttrs (old: {
|
||||
|
||||
(webcord.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
(substituteAll {
|
||||
src = ./add-extension.patch;
|
||||
@ -15,4 +17,8 @@ webcord.overrideAttrs (old: {
|
||||
description = "Webcord with Vencord web extension";
|
||||
maintainers = with maintainers; [ FlafyDev NotAShelf ];
|
||||
};
|
||||
})
|
||||
})).override {
|
||||
# Webcord has updated to electron 25, but that causes a segfault
|
||||
# when launching webcord-vencord on wayland, so downgrade it for now.
|
||||
electron_25 = electron_24;
|
||||
}
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "multiline";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/weechat/scripts/945315bed4bc2beaf1e47f9b946ffe8f638f77fe/perl/multiline.pl";
|
||||
sha256 = "1smialb21ny7brhij4sbw46xvsmrdv6ig2da0ip63ga2afngwsy4";
|
||||
url = "https://raw.githubusercontent.com/weechat/scripts/5f073d966e98d54344a91be4f5afc0ec9e2697dc/perl/multiline.pl";
|
||||
sha256 = "sha256-TXbU2Q7Tm8iTwOQqrWpqHXuKrjoBFLyUWRsH+TsR9Lo=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -6,10 +6,12 @@
|
||||
, git
|
||||
, libdbusmenu-gtk3
|
||||
, runtimeShell
|
||||
, thunderbird-unwrapped
|
||||
, thunderbirdPackages
|
||||
}:
|
||||
|
||||
let
|
||||
thunderbird-unwrapped = thunderbirdPackages.thunderbird-102;
|
||||
|
||||
version = "102.12.0";
|
||||
majVer = lib.versions.major version;
|
||||
|
||||
|
@ -8,24 +8,25 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gex";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Piturnah";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eRforLvRVSrFWnI5UZEWr1L4UM3ABjAIvui1E1hzk5s=";
|
||||
hash = "sha256-//sQ0s8bBQzuu5aO3RjPRjFuVYiGW6BwSPoCWKAx9DQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libgit2 ];
|
||||
|
||||
cargoHash = "sha256-OEaNERozmJL8gYe33V/m4HQNHi2I4KHpI6PTwFQkPSs=";
|
||||
cargoHash = "sha256-rkhkFnRDtMTWFM+E5C4jR7TWtHdy3WUtIzvGDDLHqtE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";
|
||||
homepage = "https://github.com/Piturnah/gex";
|
||||
changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ azd325 Br1ght0ne ];
|
||||
maintainers = with maintainers; [ azd325 evanrichter piturnah ];
|
||||
};
|
||||
}
|
||||
|
30
pkgs/applications/video/mpv/scripts/default.nix
Normal file
30
pkgs/applications/video/mpv/scripts/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, callPackage
|
||||
, config
|
||||
}:
|
||||
|
||||
lib.recurseIntoAttrs
|
||||
({
|
||||
acompressor = callPackage ./acompressor.nix { };
|
||||
autocrop = callPackage ./autocrop.nix { };
|
||||
autodeint = callPackage ./autodeint.nix { };
|
||||
autoload = callPackage ./autoload.nix { };
|
||||
convert = callPackage ./convert.nix { };
|
||||
inhibit-gnome = callPackage ./inhibit-gnome.nix { };
|
||||
mpris = callPackage ./mpris.nix { };
|
||||
mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { };
|
||||
mpvacious = callPackage ./mpvacious.nix { };
|
||||
quality-menu = callPackage ./quality-menu.nix { };
|
||||
simple-mpv-webui = callPackage ./simple-mpv-webui.nix { };
|
||||
sponsorblock = callPackage ./sponsorblock.nix { };
|
||||
thumbfast = callPackage ./thumbfast.nix { };
|
||||
thumbnail = callPackage ./thumbnail.nix { };
|
||||
uosc = callPackage ./uosc.nix { };
|
||||
vr-reversal = callPackage ./vr-reversal.nix { };
|
||||
webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { };
|
||||
cutter = callPackage ./cutter.nix { };
|
||||
}
|
||||
// (callPackage ./occivink.nix { }))
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14
|
||||
}
|
38
pkgs/applications/video/mpv/scripts/quality-menu.nix
Normal file
38
pkgs/applications/video/mpv/scripts/quality-menu.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, oscSupport ? false
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-quality-menu";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "christoph-heinrich";
|
||||
repo = "mpv-quality-menu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp quality-menu.lua $out/share/mpv/scripts
|
||||
'' + lib.optionalString oscSupport ''
|
||||
cp quality-menu-osc.lua $out/share/mpv/scripts
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "quality-menu.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";
|
||||
homepage = "https://github.com/christoph-heinrich/mpv-quality-menu";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ lunik1 ];
|
||||
};
|
||||
}
|
@ -1,39 +0,0 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, oscSupport ? false
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mpv-youtube-quality";
|
||||
version = "unstable-2020-02-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgreco";
|
||||
repo = "mpv-youtube-quality";
|
||||
rev = "1f8c31457459ffc28cd1c3f3c2235a53efad7148";
|
||||
sha256 = "voNP8tCwCv8QnAZOPC9gqHRV/7jgCAE63VKBd/1s5ic=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp youtube-quality.lua $out/share/mpv/scripts
|
||||
'' + lib.optionalString oscSupport ''
|
||||
cp youtube-quality-osc.lua $out/share/mpv/scripts
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "youtube-quality.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly";
|
||||
homepage = "https://github.com/jgreco/mpv-youtube-quality";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ lunik1 ];
|
||||
};
|
||||
}
|
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi
|
||||
chmod -R +w $sourceRoot/deps/libremidi
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = if set != null then "iosevka-${set}" else "iosevka";
|
||||
version = "24.1.4";
|
||||
version = "25.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+b+13D6dKHx9kvAKeN/ePcWGtDPpFB/dVwHTTprw7Co=";
|
||||
hash = "sha256-clbqr4hGtIkbgPYovYXHGW+FUTEjAn3Oq7aoPFMgGJU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-+LZQY64SdcEx+Mqb5qGelC7zbXdStJkDvcFWgUVTDnE=";
|
||||
npmDepsHash = "sha256-TxMmUgwQPbSV+1qe0FEtSPAYwJRnpuQ+qOmWvrq9xKY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
remarshal
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "23.06.21";
|
||||
version = "23.07.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FoyBO/4AB1tEHTFyQoYB/rDK+HZfFAE9c3nVULTaWpM=";
|
||||
sha256 = "sha256-JToou95HIrfqdT0IVh0colgGFXq3GR2D3FQU0Qc57Y4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cairo";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starkware-libs";
|
||||
repo = "cairo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bqLkCP1hzdOMrVyyyiOZYN0BKPe8OjKMfpFGCr1/anU=";
|
||||
hash = "sha256-tFWY4bqI+YVVu0E9EPl+c0UAsSn/cjgvEOQtyT9tkYg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FzQkAlNKFFLK8XmLafm37MvLekGE24BoLliaDpc+44w=";
|
||||
cargoHash = "sha256-fnkzR07MIwzjvg2ZRhhzYIUhuidEBZt0mGfxwHyhyVE=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
rustfmt
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -14,14 +15,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-vEjFeHSJl+yAtatYJEnu+r9hmOr/kZOgIbSUXR/c8WU=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
cd platforms/unix
|
||||
# We build the dictionary in a cross-compile compatible way.
|
||||
# For that, we perform steps, that the Makefile would otherwise do.
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make -C platforms/unix pfdicapp
|
||||
pushd fth/
|
||||
${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -i system.fth
|
||||
${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -d pforth.dic <<< "include savedicd.fth sdad bye"
|
||||
mv pforth.dic pfdicdat.h ../platforms/unix/
|
||||
popd
|
||||
make -C platforms/unix pforthapp
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 pforth_standalone $out/bin/pforth
|
||||
runHook preInstall
|
||||
install -Dm755 platforms/unix/pforth_standalone $out/bin/pforth
|
||||
mkdir -p $out/share/pforth
|
||||
cp -r fth/* $out/share/pforth/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
40
pkgs/development/interpreters/femtolisp/default.nix
Normal file
40
pkgs/development/interpreters/femtolisp/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "femtolisp";
|
||||
version = "unstable-2023-07-12";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ft";
|
||||
repo = "femtolisp";
|
||||
rev = "b3a21a0ff408e559639f6c31e1a2ab970787567f";
|
||||
hash = "sha256-PE/xYhfhn0xv/kJWsS07fOF2n5sXP666vy7OVaNxc7Y=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t $out/bin/ flisp
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "A compact interpreter for a minimal lisp/scheme dialect";
|
||||
homepage = "https://git.sr.ht/~ft/femtolisp";
|
||||
license = with lib.licenses; [ mit bsd3 ];
|
||||
maintainers = with lib.maintainers; [ moody ];
|
||||
broken = stdenv.isDarwin;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ lib, perl, buildEnv, makeWrapper
|
||||
{ lib, perl, buildEnv, makeBinaryWrapper
|
||||
, extraLibs ? []
|
||||
, extraOutputsToInstall ? []
|
||||
, postBuild ? ""
|
||||
@ -17,7 +17,7 @@ let
|
||||
inherit ignoreCollisions;
|
||||
extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
# we create wrapper for the binaries in the different packages
|
||||
postBuild = ''
|
||||
|
@ -9,15 +9,15 @@
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libremidi";
|
||||
version = "unstable-2023-05-05";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcelerier";
|
||||
repo = "libremidi";
|
||||
rev = "cd2e52d59c8ecc97d751619072c4f4271fa82455";
|
||||
hash = "sha256-CydoCprxqDl5FXjtgT+AckaRTqQAlCDwwrnPDK17A6o=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-aO83a0DmzwjYXDlPIsn136EkDF0406HadTXPoGuVF6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -8,15 +8,15 @@
|
||||
, raylib-games
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "raylib";
|
||||
version = "4.2.0";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raysan5";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-aMIjywcQxki0cKlNznPAMfvrtGj3qcR95D4/BDuPZZM=";
|
||||
repo = "raylib";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Uqqzq5shDp0AgSBT5waHBNUkEu0LRj70SNOlR5R2yAM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -27,16 +27,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional pulseSupport libpulseaudio;
|
||||
propagatedBuildInputs = [ libGLU libX11 ];
|
||||
|
||||
patches = [
|
||||
# fixes glfw compile error;
|
||||
# remove with next raylib version > 4.2.0 or when glfw 3.4.0 is released.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/raysan5/raylib/commit/2ad7967db80644a25ca123536cf2f6efcb869684.patch";
|
||||
sha256 = "sha256-/xgzox1ITeoZ91QWdwnJJ+jJ5nJsMHcEgbIEdNYh4NY=";
|
||||
name = "raylib-glfw-fix.patch";
|
||||
})
|
||||
];
|
||||
|
||||
# https://github.com/raysan5/raylib/wiki/CMake-Build-Options
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_GLFW=ON"
|
||||
@ -45,12 +35,6 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
|
||||
++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
|
||||
|
||||
# fix libasound.so/libpulse.so not being found
|
||||
preFixup = ''
|
||||
${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"}
|
||||
${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"}
|
||||
'';
|
||||
|
||||
passthru.tests = [ raylib-games ];
|
||||
|
||||
meta = with lib; {
|
||||
@ -59,6 +43,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ adamlwgriffiths ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/raysan5/raylib/blob/${version}/CHANGELOG";
|
||||
changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "androidtvremote2";
|
||||
version = "0.0.10";
|
||||
version = "0.0.11";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "androidtvremote2";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LjYXQTPTFS80gI3WeJOLrKZ0C0JhGb5p1M70P7n29hc=";
|
||||
hash = "sha256-mjhohkAC6g2UJgPbq/29Awyy6c4M8SnLqr5v5g7+IeE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,6 +2,7 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, deprecated
|
||||
, rich
|
||||
, backoff
|
||||
@ -14,33 +15,106 @@
|
||||
, httpx
|
||||
, pandas
|
||||
, monotonic
|
||||
# test dependencies
|
||||
, pytestCheckHook
|
||||
# optional-dependencies
|
||||
, fastapi
|
||||
, sqlalchemy
|
||||
, opensearch-py
|
||||
, factory_boy
|
||||
, elasticsearch8
|
||||
, elastic-transport
|
||||
, luqum
|
||||
, pytest-asyncio
|
||||
, passlib
|
||||
, python-jose
|
||||
, alembic
|
||||
, uvicorn
|
||||
, smart-open
|
||||
, brotli-asgi
|
||||
, alembic
|
||||
, sqlalchemy
|
||||
, greenlet
|
||||
, aiosqlite
|
||||
, luqum
|
||||
, scikit-learn
|
||||
, aiofiles
|
||||
, pyyaml
|
||||
, python-multipart
|
||||
, python-jose
|
||||
, passlib
|
||||
, psutil
|
||||
# , segment-analytics-python
|
||||
, asyncpg
|
||||
, psycopg2
|
||||
, schedule
|
||||
, prodict
|
||||
, datasets
|
||||
, psutil
|
||||
, spacy
|
||||
, cleanlab
|
||||
, snorkel
|
||||
, transformers
|
||||
, datasets
|
||||
, huggingface-hub
|
||||
# , flair
|
||||
, faiss
|
||||
, flyingsquid
|
||||
, pgmpy
|
||||
, plotly
|
||||
, snorkel
|
||||
, spacy
|
||||
, transformers
|
||||
, evaluate
|
||||
, seqeval
|
||||
# , setfit
|
||||
# , span_marker
|
||||
, openai
|
||||
, peft
|
||||
# test dependencies
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pytest-mock
|
||||
, pytest-asyncio
|
||||
, factory_boy
|
||||
}:
|
||||
let
|
||||
pname = "argilla";
|
||||
version = "1.8.0";
|
||||
version = "1.12.0";
|
||||
optional-dependencies = {
|
||||
server = [
|
||||
fastapi
|
||||
opensearch-py
|
||||
elasticsearch8
|
||||
uvicorn
|
||||
smart-open
|
||||
brotli-asgi
|
||||
alembic
|
||||
sqlalchemy
|
||||
greenlet
|
||||
aiosqlite
|
||||
luqum
|
||||
scikit-learn
|
||||
aiofiles
|
||||
pyyaml
|
||||
python-multipart
|
||||
python-jose
|
||||
passlib
|
||||
psutil
|
||||
# segment-analytics-python
|
||||
] ++
|
||||
elasticsearch8.optional-dependencies.async ++
|
||||
uvicorn.optional-dependencies.standard ++
|
||||
python-jose.optional-dependencies.cryptography ++
|
||||
passlib.optional-dependencies.bcrypt;
|
||||
postgresql = [ asyncpg psycopg2 ];
|
||||
listeners = [ schedule prodict ];
|
||||
integrations = [
|
||||
pyyaml
|
||||
cleanlab
|
||||
datasets
|
||||
huggingface-hub
|
||||
# flair
|
||||
faiss
|
||||
flyingsquid
|
||||
pgmpy
|
||||
plotly
|
||||
snorkel
|
||||
spacy
|
||||
transformers
|
||||
evaluate
|
||||
seqeval
|
||||
# setfit
|
||||
# span_marker
|
||||
openai
|
||||
peft
|
||||
] ++ transformers.optional-dependencies.torch;
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -52,64 +126,57 @@ buildPythonPackage {
|
||||
owner = "argilla-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pUfuwA/+fe1VVWyGxEkvSuJLNxw3sHmp8cQZecW8GWY=";
|
||||
hash = "sha256-NImtS2bbCfbhbrw12xhGdZp/JVfrB6cHnUHYX3xJ7tw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"rich <= 13.0.1"' '"rich"' \
|
||||
--replace '"numpy < 1.24.0"' '"numpy"'
|
||||
'';
|
||||
pythonRelaxDeps = [
|
||||
"typer"
|
||||
"rich"
|
||||
"numpy"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
deprecated
|
||||
rich
|
||||
backoff
|
||||
packaging
|
||||
pandas
|
||||
pydantic
|
||||
typer
|
||||
tqdm
|
||||
wrapt
|
||||
numpy
|
||||
pandas
|
||||
httpx
|
||||
tqdm
|
||||
backoff
|
||||
monotonic
|
||||
rich
|
||||
typer
|
||||
];
|
||||
|
||||
# still quite a bit of optional dependencies missing
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# tests require an opensearch instance running and flyingsquid to be packaged
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
fastapi
|
||||
sqlalchemy
|
||||
opensearch-py
|
||||
factory_boy
|
||||
elasticsearch8
|
||||
elastic-transport
|
||||
luqum
|
||||
pytest-cov
|
||||
pytest-mock
|
||||
pytest-asyncio
|
||||
passlib
|
||||
python-jose
|
||||
alembic
|
||||
uvicorn
|
||||
schedule
|
||||
prodict
|
||||
datasets
|
||||
psutil
|
||||
spacy
|
||||
cleanlab
|
||||
snorkel
|
||||
transformers
|
||||
faiss
|
||||
] ++ opensearch-py.optional-dependencies.async;
|
||||
factory_boy
|
||||
]
|
||||
++ optional-dependencies.server
|
||||
++ optional-dependencies.postgresql
|
||||
++ optional-dependencies.listeners
|
||||
++ optional-dependencies.integrations;
|
||||
|
||||
pytestFlagsArray = [ "--ignore=tests/server/datasets/test_dao.py" ];
|
||||
|
||||
passthru.optional-dependencies = optional-dependencies;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Argilla: the open-source data curation platform for LLMs";
|
||||
homepage = "https://github.com/argilla-io/argilla";
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-containerregistry";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6IU+fzMIL8HJv4rCrWlcJSuYre6cdBa7BjS9KrIbIRU=";
|
||||
hash = "sha256-Ss0ygh0IZVPqvV3f7Lsh+5FbXRPvg3XRWvyyyAvclqM=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
35
pkgs/development/python-modules/before-after/default.nix
Normal file
35
pkgs/development/python-modules/before-after/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ buildPythonPackage, fetchPypi, fetchpatch, pytestCheckHook, lib }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "before-after";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "before_after";
|
||||
inherit version;
|
||||
hash = "sha256-x9T5uLi7UgldoUxLnFnqaz9bnqn9zop7/HLsrg9aP4U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# drop 'mock' dependency for python >=3.3
|
||||
(fetchpatch {
|
||||
url = "https://github.com/c-oreills/before_after/commit/cf3925148782c8c290692883d1215ae4d2c35c3c.diff";
|
||||
hash = "sha256-FYCpLxcOLolNPiKzHlgrArCK/QKCwzag+G74wGhK4dc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/c-oreills/before_after/commit/11c0ecc7e8a2f90a762831e216c1bc40abfda43a.diff";
|
||||
hash = "sha256-8YJumF/U8H+hc7rLZLy3UhXHdYJmcuN+O8kMx8yqMJ0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "before_after" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "sugar over the Mock library to help test race conditions";
|
||||
homepage = "https://github.com/c-oreills/before_after";
|
||||
maintainers = with maintainers; [ yuka ];
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
}
|
49
pkgs/development/python-modules/brotli-asgi/default.nix
Normal file
49
pkgs/development/python-modules/brotli-asgi/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
# build inputs
|
||||
, starlette
|
||||
, brotli
|
||||
# check inputs
|
||||
, requests
|
||||
, mypy
|
||||
, brotlipy
|
||||
}:
|
||||
let
|
||||
pname = "brotli-asgi";
|
||||
version = "1.4.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fullonic";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
starlette
|
||||
brotli
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "brotli_asgi" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
requests
|
||||
mypy
|
||||
brotlipy
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A compression AGSI middleware using brotli";
|
||||
homepage = "https://github.com/fullonic/brotli-asgi";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
@ -5,11 +5,10 @@
|
||||
, testscenarios
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "cliff";
|
||||
inherit (cliff) version;
|
||||
|
||||
src = cliff.src;
|
||||
inherit (cliff) version src;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
# only a small portion of the listed packages are actually needed for running the tests
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, cython
|
||||
, pytestCheckHook
|
||||
, hypothesis
|
||||
@ -9,6 +10,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "datrie";
|
||||
version = "0.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
@ -16,17 +18,17 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
cython
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
hypothesis
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace '"pytest-runner", ' ""
|
||||
'';
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "datrie" ];
|
||||
|
||||
|
@ -3,11 +3,10 @@
|
||||
, stestr
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "debtcollector-tests";
|
||||
inherit (debtcollector) version;
|
||||
|
||||
src = debtcollector.src;
|
||||
inherit (debtcollector) version src;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
# only a small portion of the listed packages are actually needed for running the tests
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "devolo-plc-api";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "2Fake";
|
||||
repo = "devolo_plc_api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg=";
|
||||
hash = "sha256-viOyxgFydPrTPFz6JsjJT6IiUIeoIwd+bcrAJfomDI8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,27 +1,40 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonRelaxDepsHook
|
||||
, django
|
||||
, funcy
|
||||
, redis
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, pytest-django
|
||||
, mock
|
||||
, dill
|
||||
, jinja2
|
||||
, before-after
|
||||
, pythonOlder
|
||||
, nettools
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-cacheops";
|
||||
version = "6.2";
|
||||
version = "7.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zHP9ChwUeZJT/yCopFeRo8jSgCIXswHnDPoIroGeQ48=";
|
||||
hash = "sha256-Ed3qh90DlWiXikCD2JyJ37hm6lWnpI+2haaPwZiotlA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
pythonRelaxDeps = [ "funcy" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
funcy
|
||||
@ -32,23 +45,21 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-django
|
||||
mock
|
||||
dill
|
||||
jinja2
|
||||
before-after
|
||||
nettools
|
||||
pkgs.redis
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require networking
|
||||
"test_cached_as"
|
||||
"test_invalidation_signal"
|
||||
"test_queryset"
|
||||
"test_queryset_empty"
|
||||
"test_lock"
|
||||
"test_context_manager"
|
||||
"test_decorator"
|
||||
"test_in_transaction"
|
||||
"test_nested"
|
||||
"test_unhashable_args"
|
||||
"test_db_agnostic_by_default"
|
||||
"test_db_agnostic_disabled"
|
||||
];
|
||||
preCheck = ''
|
||||
redis-server &
|
||||
while ! redis-cli --scan ; do
|
||||
echo waiting for redis to be ready
|
||||
sleep 1
|
||||
done
|
||||
'';
|
||||
|
||||
DJANGO_SETTINGS_MODULE = "tests.settings";
|
||||
|
||||
@ -58,8 +69,7 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
# No support for funcy > 2
|
||||
# https://github.com/Suor/django-cacheops/issues/454
|
||||
broken = true;
|
||||
# Times out for unknown reasons
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
{ buildPythonPackage
|
||||
, dm-haiku
|
||||
, chex
|
||||
, cloudpickle
|
||||
@ -16,9 +15,10 @@
|
||||
, rlax
|
||||
, distrax
|
||||
, tensorflow-probability
|
||||
, optax }:
|
||||
, optax
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "dm-haiku-tests";
|
||||
inherit (dm-haiku) version;
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dsmr-parser";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "ndokter";
|
||||
repo = "dsmr_parser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-M6ztqENIeD5foagKUXtJiGfFZPHsczlB0/AH4FMIsLY=";
|
||||
hash = "sha256-R/4k6yZS96yAkjhO/Ay9MJ2KUlq9TFQvsUoqpjvZcKI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ducc0";
|
||||
version = "0.30.0";
|
||||
version = "0.31.0";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
||||
owner = "mtr";
|
||||
repo = "ducc";
|
||||
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
|
||||
hash = "sha256-xYjgJGtWl9AjnzlFvdj/0chnIUDmoH85AtKXsNBwWUU=";
|
||||
hash = "sha256-4aNIq5RNo1Qqiqr2wjYB/FXKyvbARsRF1yW1ZzZlAOo=";
|
||||
};
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
|
@ -5,7 +5,7 @@
|
||||
, testpath
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "flit-core";
|
||||
inherit (flit-core) version;
|
||||
|
||||
|
@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-pubsub";
|
||||
version = "2.17.1";
|
||||
version = "2.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BZNCjsuwJJy150G0A+lcPUIbRpfIPrftTBaE3/F2x1M=";
|
||||
hash = "sha256-enDfQRHZy2lKJc7N0jKIJxWcUhOuHmMEyzq7OPN53Sk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -10,11 +10,10 @@
|
||||
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "ipykernel-tests";
|
||||
inherit (ipykernel) version;
|
||||
|
||||
src = ipykernel.src;
|
||||
inherit (ipykernel) version src;
|
||||
format = "other";
|
||||
|
||||
dontBuild = true;
|
||||
dontInstall = true;
|
||||
|
@ -1,34 +1,40 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, fetchPypi
|
||||
, libmaxminddb
|
||||
, mock
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "maxminddb";
|
||||
version = "2.3.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "2.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Egkg3d2VXzKuSMIHxs72/V3Ih0qIm6lLDywfc27N8wg=";
|
||||
hash = "sha256-geVOU0CL1QJlDllpzLoWeAr2WewdscRLLJl+QzCl7ZY=";
|
||||
};
|
||||
|
||||
buildInputs = [ libmaxminddb ];
|
||||
buildInputs = [
|
||||
libmaxminddb
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ nose mock ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests are broken for macOS on python38
|
||||
doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8");
|
||||
pythonImportsCheck = [
|
||||
"maxminddb"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reader for the MaxMind DB format";
|
||||
homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python";
|
||||
changelog = "https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v${version}/HISTORY.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "metar";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "python-metar";
|
||||
repo = "python-metar";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-53vgnViEYuMVKEnIZ2BNyIUrURR2rwopx7RWyFmF5PA=";
|
||||
hash = "sha256-ZDjlXcSTUcSP7oRdhzLpXf/fLUA7Nkc6nj2I6vovbHg=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.28.0";
|
||||
version = "1.28.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-J4Z8oyWoRXAKAI8/yplQBrMvLg0Yr+Z2NStJRT9HfWk=";
|
||||
hash = "sha256-wrRUQTEmB5pkNKPgWnXLTK2UfHYk5TujhGy4KaIjDEs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "14.2.1";
|
||||
version = "14.3.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
postFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
hash = "sha256-i09FPyplYhBqgHWWSXZrvI+7f31yzc5KvgAqVJ3WtWU=";
|
||||
hash = "sha256-OUz19N2YIl7iwayjulx0v1K00jB5SdWo8m5XiJ9BDSs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -15,11 +15,9 @@
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "openstacksdk-tests";
|
||||
inherit (openstacksdk) version;
|
||||
inherit (openstacksdk) version src;
|
||||
format = "other";
|
||||
|
||||
src = openstacksdk.src;
|
||||
|
||||
dontBuild = true;
|
||||
dontInstall = true;
|
||||
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.0.13";
|
||||
version = "0.0.14";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WZRJnvZYycOoLNhtShXQ3HPNqyoJymUx+Xwg5gPWGKg=";
|
||||
hash = "sha256-eTlFb/v88jaEzx5H8ofHMNkqPunDvXcXGvg5ThripeA=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
{ buildPythonPackage
|
||||
, dm-haiku
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
@ -9,7 +8,7 @@
|
||||
, optax
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "optax-tests";
|
||||
inherit (optax) version;
|
||||
|
||||
@ -31,5 +30,4 @@ buildPythonPackage rec {
|
||||
# See https://github.com/deepmind/optax/issues/323
|
||||
"examples/lookahead_mnist_test.py"
|
||||
];
|
||||
|
||||
}
|
||||
|
@ -7,11 +7,10 @@
|
||||
, testscenarios
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "os-service-types-tests";
|
||||
inherit (os-service-types) version;
|
||||
|
||||
src = os-service-types.src;
|
||||
inherit (os-service-types) version src;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
# only a small portion of the listed packages are actually needed for running the tests
|
||||
|
@ -9,11 +9,10 @@
|
||||
, testscenarios
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-config-tests";
|
||||
inherit (oslo-config) version;
|
||||
|
||||
src = oslo-config.src;
|
||||
buildPythonPackage {
|
||||
pname = "oslo-config-tests";
|
||||
inherit (oslo-config) version src;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
# only a small portion of the listed packages are actually needed for running the tests
|
||||
|
@ -4,11 +4,10 @@
|
||||
, stestr
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "oslotest-tests";
|
||||
inherit (oslotest) version;
|
||||
|
||||
src = oslotest.src;
|
||||
inherit (oslotest) version src;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
# only a small portion of the listed packages are actually needed for running the tests
|
||||
|
@ -10,11 +10,10 @@
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "pbr";
|
||||
inherit (pbr) version;
|
||||
|
||||
src = pbr.src;
|
||||
inherit (pbr) version src;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
# only a small portion of the listed packages are actually needed for running the tests
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "praw";
|
||||
version = "7.7.0";
|
||||
version = "7.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "praw-dev";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-reJW1M1yDSQ1SvZJeOc0jwHj6ydl1AmMl5VZqRHxXZA=";
|
||||
hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydaikin";
|
||||
version = "2.9.1";
|
||||
version = "2.10.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "mustang51";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HWJ+VHrSwdVN+PNp5NoqmDTVqb6RJy2Sr3zlrDuSBgA=";
|
||||
hash = "sha256-G4mNBHk8xskQyt1gbMqz5XhoTfWWxp+qTruOSqmTvOc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -30,6 +30,8 @@ buildPythonPackage rec {
|
||||
urllib3
|
||||
];
|
||||
|
||||
doCheck = false; # tests fail and upstream does not seem to run them either
|
||||
|
||||
nativeCheckInputs = [
|
||||
freezegun
|
||||
pytest-aiohttp
|
||||
|
37
pkgs/development/python-modules/pyre-extensions/default.nix
Normal file
37
pkgs/development/python-modules/pyre-extensions/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
# build inputs
|
||||
, typing-extensions
|
||||
, typing-inspect
|
||||
}:
|
||||
let
|
||||
pname = "pyre-extensions";
|
||||
version = "0.0.30";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
disable = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-unkjxIbgia+zehBiOo9K6C1zz/QkJtcRxIrwcOW8MbI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
typing-extensions
|
||||
typing-inspect
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyre_extensions" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "This module defines extensions to the standard “typing” module that are supported by the Pyre typechecker";
|
||||
homepage = "https://pypi.org/project/pyre-extensions";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmartthings";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "andrewsayre";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-AzAiMn88tRRPwMpwSnKoS1XUERHbKz0sVm/TjcbTsGs=";
|
||||
hash = "sha256-r+f2+vEXJdQGDlbs/MhraFgEmsAf32PU282blLRLjzc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -6,7 +6,7 @@
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "pytest-asyncio-tests";
|
||||
inherit (pytest-asyncio) version;
|
||||
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-crontab";
|
||||
version = "2.7.1";
|
||||
version = "3.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-shr0ZHx7u4SP7y8CBhbGsCidy5+UtPmRpVMQ/5vsV0k=";
|
||||
hash = "sha256-eft0ZQOd39T7k9By1u4NRcGsi/FZfwaG6hT9Q2Hbo3k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -22,12 +22,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-manilaclient";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iKBbR4h9J9OiQMHjUHxUVk+NbCRUYmIPtWxRwVVGQtY=";
|
||||
hash = "sha256-voeJkwe/7nta2B19+Y5d27XTkhQ/nbWt6MXOicYQZnU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,11 +7,10 @@
|
||||
, python-openstackclient
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "python-manilaclient-tests";
|
||||
inherit (python-manilaclient) version;
|
||||
|
||||
src = python-manilaclient.src;
|
||||
inherit (python-manilaclient) version src;
|
||||
format = "other";
|
||||
|
||||
dontBuild = true;
|
||||
dontInstall = true;
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python3-application";
|
||||
version = "3.0.4";
|
||||
version = "3.0.6";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
||||
owner = "AGProjects";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-XXAKp/RlBVs3KmcnuiexdYfxf0zt2A/DrsJzdC9I4vA=";
|
||||
hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zope_interface twisted ];
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "application" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A collection of modules that are useful when building python applications";
|
||||
homepage = "https://github.com/AGProjects/python3-application";
|
||||
license = licenses.lgpl21Plus;
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
@ -45,6 +46,12 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved.
|
||||
"test_error_without_config_file_macos"
|
||||
"test_file_1_is_bad_without_config_macos"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rstcheck_core"
|
||||
];
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchFromGitHub
|
||||
@ -53,6 +54,12 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved.
|
||||
"test_error_without_config_file_macos"
|
||||
"test_file_1_is_bad_without_config_macos"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rstcheck"
|
||||
];
|
||||
|
40
pkgs/development/python-modules/semaphore-bot/default.nix
Normal file
40
pkgs/development/python-modules/semaphore-bot/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python-dateutil
|
||||
, attrs
|
||||
, anyio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "semaphore-bot";
|
||||
version = "0.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-EOUvzW4a8CgyQSxb2fXnIWfOYs5Xe0v794vDIruSHmI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "anyio>=3.5.0,<=3.6.2" "anyio"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
anyio
|
||||
attrs
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
# Upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "semaphore" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple rule-based bot library for Signal Private Messenger";
|
||||
homepage = "https://github.com/lwesterhof/semaphore";
|
||||
license = with licenses; [ agpl3Plus ];
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
@ -7,13 +7,11 @@
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "setuptools-scm-tests";
|
||||
inherit (setuptools-scm) version;
|
||||
inherit (setuptools-scm) version src;
|
||||
format = "other";
|
||||
|
||||
src = setuptools-scm.src;
|
||||
|
||||
dontBuild = true;
|
||||
dontInstall = true;
|
||||
|
||||
|
@ -2,11 +2,10 @@
|
||||
, stestr
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "stestr-tests";
|
||||
inherit (stestr) version;
|
||||
|
||||
src = stestr.src;
|
||||
inherit (stestr) version src;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
# only a small portion of the listed packages are actually needed for running the tests
|
||||
|
@ -12,10 +12,9 @@
|
||||
, wsproto
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "uvicorn-tests";
|
||||
inherit (uvicorn) version;
|
||||
|
||||
format = "other";
|
||||
|
||||
src = uvicorn.testsout;
|
||||
|
@ -6,7 +6,7 @@
|
||||
, wasmer-compiler-singlepass
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "wasmer-tests";
|
||||
inherit (wasmer) version;
|
||||
|
||||
|
@ -14,16 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xarray-einstats";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arviz-devs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oDrNR7iVDg7Piti6JNaXGekfrUfK5GWJYbH/g6m4570=";
|
||||
hash = "sha256-TXuNqXsny7VpJqV5/3riKzXLheZl+qF+zf4SCMipzmw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
85
pkgs/development/python-modules/xformers/default.nix
Normal file
85
pkgs/development/python-modules/xformers/default.nix
Normal file
@ -0,0 +1,85 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, pythonRelaxDepsHook
|
||||
, which
|
||||
# runtime dependencies
|
||||
, numpy
|
||||
, torch
|
||||
, pyre-extensions
|
||||
# check dependencies
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
# , pytest-mpi
|
||||
, pytest-timeout
|
||||
# , pytorch-image-models
|
||||
, hydra-core
|
||||
, fairscale
|
||||
, scipy
|
||||
, cmake
|
||||
, openai-triton
|
||||
, networkx
|
||||
}:
|
||||
let
|
||||
version = "0.0.20";
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "xformers";
|
||||
inherit version;
|
||||
format = "setuptools";
|
||||
|
||||
disable = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "xformers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OFH4I3eTKw1bQEKHh1AvkpcoShKK5R5674AoJ/mY85I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
cat << EOF > ./xformers/version.py
|
||||
# noqa: C801
|
||||
__version__ = "${version}"
|
||||
EOF
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
which
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pyre-extensions"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
torch
|
||||
pyre-extensions
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "xformers" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
pytest-timeout
|
||||
hydra-core
|
||||
fairscale
|
||||
scipy
|
||||
cmake
|
||||
networkx
|
||||
openai-triton
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "XFormers: A collection of composable Transformer building blocks";
|
||||
homepage = "https://github.com/facebookresearch/xformers";
|
||||
changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user