mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-28 23:22:58 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b9ec6f58ab
@ -361,6 +361,22 @@ modifications.
|
||||
|
||||
Do pay attention to passing in the right Python version!
|
||||
|
||||
#### `mkPythonMetaPackage` function {#mkpythonmetapackage-function}
|
||||
|
||||
This will create a meta package containing [metadata files](https://packaging.python.org/en/latest/specifications/recording-installed-packages/) to satisfy a dependency on a package, without it actually having been installed into the environment.
|
||||
In nixpkgs this is used to package Python packages with split binary/source distributions such as [psycopg2](https://pypi.org/project/psycopg2/)/[psycopg2-binary](https://pypi.org/project/psycopg2-binary/).
|
||||
|
||||
```nix
|
||||
mkPythonMetaPackage {
|
||||
pname = "psycopg2-binary";
|
||||
inherit (psycopg2) optional-dependencies version;
|
||||
dependencies = [ psycopg2 ];
|
||||
meta = {
|
||||
inherit (psycopg2.meta) description homepage;
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
#### `python.buildEnv` function {#python.buildenv-function}
|
||||
|
||||
Python environments can be created using the low-level `pkgs.buildEnv` function.
|
||||
|
||||
@ -26,13 +26,13 @@ assert withEmojis -> (!withIcons && !withNerdIcons);
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nnn";
|
||||
version = "4.9";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jarun";
|
||||
repo = "nnn";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU=";
|
||||
hash = "sha256-HShHSjqD0zeE1/St1Y2dUeHfac6HQnPFfjmFvSuEXUA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "iroh";
|
||||
version = "0.21.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g/x5lVVrm1NrJbqmhza/wryEwuXHh1tDBf+x6vL+2n0=";
|
||||
hash = "sha256-kXKA0gDmxruoHLTB9zJ36ydqqwaeyQm/Icqgv6API0k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Sp2yMF/M3SuNB1DDQ79Lau5IxtSM1NPLJi9TnHWqnuc=";
|
||||
cargoHash = "sha256-XUokfLMXIYfiN4A2/aYYhq0N7H2vsZL1uvKg498M3yA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
let
|
||||
pname = "anytype";
|
||||
version = "0.42.4";
|
||||
version = "0.42.5";
|
||||
name = "Anytype-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
|
||||
hash = "sha256-SFLjjr+L7eTqaZ2teug7mzXhIU+eVebBqrE4q5aasLk=";
|
||||
hash = "sha256-43g/CdmmQTSxk7OTZMPIiWIYJjCG2zJNM9kaAq1jOqE=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in appimageTools.wrapType2 {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "7.0.7";
|
||||
hash = "sha256-Xk5ElAfTjbz77Jv5VMbSW7q8qJ5vhNd3daNilNzDsY4=";
|
||||
version = "7.0.8";
|
||||
hash = "sha256-m6yToQQFM+4g8xhs572O4n4r06xeS3DozYHtAKwMjUg=";
|
||||
npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU=";
|
||||
vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw=";
|
||||
lts = true;
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import ./generic.nix {
|
||||
version = "8.0.1";
|
||||
hash = "sha256-0D2ntZVK4k5AwAMg4XnLyabnxAoHx9JjBoFAdkfrdAY=";
|
||||
version = "8.0.2";
|
||||
hash = "sha256-rjwZjwt0F9AhXgQ8CzOfsZ3acyBvzsDc/2LHRWieDzg=";
|
||||
npmDepsHash = "sha256-6AMaZadgcTvOBsIXJjZQB6Q1rkdn+R82pclXdVvtdWY=";
|
||||
vendorHash = "sha256-tNb0tCf+gjUmUqrjkzt7Wqqz21hW9WRh8CEdX8rv8Do=";
|
||||
vendorHash = "sha256-4l4kscwesW/cR8mZjE3G9HcVm0d1ukxbtBY6RXYRi8k=";
|
||||
lts = false;
|
||||
nixUpdateExtraArgs = [
|
||||
"--override-filename"
|
||||
|
||||
@ -40,19 +40,13 @@
|
||||
, useDiscordRichPresence ? false , rapidjson
|
||||
}: let
|
||||
inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath;
|
||||
|
||||
compat-list = fetchurl {
|
||||
name = "lime3ds-compat-list";
|
||||
url = "https://raw.githubusercontent.com/Lime3DS/compatibility-list/fa9d49d22e698df2f238e53f2b34acda08b947f6/compatibility_list.json";
|
||||
hash = "sha256-dNZuU8uFXJ5gw/rmtF6bAjtrvVBXP8aUNXVdBY1dT34=";
|
||||
};
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lime3ds";
|
||||
version = "2116";
|
||||
version = "2117.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/Lime3DS/Lime3DS/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ff4An+ZdxlY4H90Yep4lpKROOMEkDijb3dVFIgSPvWQ=";
|
||||
hash = "sha256-v6AHzbuk5n55nTDO0UndtmdhovfY4kngC5TJaNIV5S4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -104,10 +98,6 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
mkdir externals/dynarmic/src/dynarmic/ir/var
|
||||
ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty
|
||||
|
||||
# Prep compatibilitylist
|
||||
rm ./dist/compatibility_list/compatibility_list.json
|
||||
ln -s ${compat-list} ./dist/compatibility_list/compatibility_list.json
|
||||
|
||||
# We already know the submodules are present
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "check_submodules_present()" ""
|
||||
@ -140,8 +130,6 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
(cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
|
||||
(cmakeBool "DISABLE_SYSTEM_VMA" true)
|
||||
(cmakeBool "DISABLE_SYSTEM_XBYAK" true)
|
||||
(cmakeBool "CITRA_ENABLE_COMPATIBILITY_REPORTING" true)
|
||||
(cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false)
|
||||
(cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend)
|
||||
(cmakeBool "ENABLE_CUBEB" enableCubeb)
|
||||
(cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
|
||||
|
||||
@ -93,6 +93,7 @@ let
|
||||
|
||||
meta = {
|
||||
homepage = "https://micro-editor.github.io";
|
||||
changelog = "https://github.com/zyedidia/micro/releases/";
|
||||
description = "Modern and intuitive terminal-based text editor";
|
||||
longDescription = ''
|
||||
micro is a terminal-based text editor that aims to be easy to use and
|
||||
@ -106,7 +107,10 @@ let
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "micro";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres
|
||||
pbsds
|
||||
];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
46
pkgs/by-name/sv/svix-server/Cargo.lock
generated
46
pkgs/by-name/sv/svix-server/Cargo.lock
generated
@ -399,6 +399,17 @@ dependencies = [
|
||||
"reactor-trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-socks5"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77f634add2445eb2c1f785642a67ca1073fedd71e73dc3ca69435ef9b9bdedc7"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-stream"
|
||||
version = "0.3.5"
|
||||
@ -2122,6 +2133,21 @@ dependencies = [
|
||||
"tower-service",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hyper-socks2"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4"
|
||||
dependencies = [
|
||||
"async-socks5",
|
||||
"futures",
|
||||
"http 0.2.12",
|
||||
"hyper 0.14.28",
|
||||
"hyper-tls 0.5.0",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hyper-timeout"
|
||||
version = "0.4.1"
|
||||
@ -2134,6 +2160,19 @@ dependencies = [
|
||||
"tokio-io-timeout",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hyper-tls"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"hyper 0.14.28",
|
||||
"native-tls",
|
||||
"tokio",
|
||||
"tokio-native-tls",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hyper-tls"
|
||||
version = "0.6.0"
|
||||
@ -3676,7 +3715,7 @@ dependencies = [
|
||||
"http-body 1.0.1",
|
||||
"http-body-util",
|
||||
"hyper 1.4.1",
|
||||
"hyper-tls",
|
||||
"hyper-tls 0.6.0",
|
||||
"hyper-util",
|
||||
"ipnet",
|
||||
"js-sys",
|
||||
@ -4753,7 +4792,7 @@ dependencies = [
|
||||
"http-body-util",
|
||||
"hyper 1.4.1",
|
||||
"hyper-rustls 0.26.0",
|
||||
"hyper-tls",
|
||||
"hyper-tls 0.6.0",
|
||||
"hyper-util",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
@ -4791,7 +4830,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "svix-server"
|
||||
version = "1.28.0"
|
||||
version = "1.30.0"
|
||||
dependencies = [
|
||||
"aide",
|
||||
"anyhow",
|
||||
@ -4818,6 +4857,7 @@ dependencies = [
|
||||
"http 0.2.12",
|
||||
"hyper 0.14.28",
|
||||
"hyper-openssl",
|
||||
"hyper-socks2",
|
||||
"indexmap 1.9.3",
|
||||
"ipnet",
|
||||
"jsonschema",
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svix-server";
|
||||
version = "1.28.0";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svix";
|
||||
repo = "svix-webhooks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6GKb3tSO4yr2tMH7V5oOPSsWK4OLX0/Zqd2N+ZrIvls=";
|
||||
hash = "sha256-W5oLN0rMG2c8h05sIEOf4h95SQrFrs/7vLpsHH91sIA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/server";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "10.0.1";
|
||||
version = "10.1.0";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "erebe";
|
||||
repo = "wstunnel";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lahuuVc+fbuWMXaWvt8C6j26Mo/1o5PkBfVH+lemdv4=";
|
||||
hash = "sha256-nOks9OMA0z7e1nYnKxkSmEj5GXP00385E+jr67lzS5c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gNx01LHIcAbedO2X/OwwnQWd9d0Qc6ahe84IRUyptcY=";
|
||||
cargoHash = "sha256-QJ5Fb1M5CLDd2bZPy2p9zqh2A9KIoHp7PA1fxX2RDjI=";
|
||||
|
||||
nativeBuildInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@ -18,12 +18,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.81.1";
|
||||
version = "1.83.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
hash = "sha256-MDmCsDXc4ohqz+btqbWhhq0PoTNqE6MfVpzrjIoS4rU=";
|
||||
hash = "sha256-shXGr+Cgs6uEO1eIeWytaOmMbq1fjTshud/AH5A1gZs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
58
pkgs/development/interpreters/python/meta-package.nix
Normal file
58
pkgs/development/interpreters/python/meta-package.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
hatchling,
|
||||
}:
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
dependencies ? [ ],
|
||||
optional-dependencies ? { },
|
||||
passthru ? { },
|
||||
meta ? { },
|
||||
}:
|
||||
|
||||
# Create a "fake" meta package to satisfy a dependency on a package, but don't actually build it.
|
||||
# This is useful for packages that have a split binary/source dichotomy like psycopg2/psycopg2-binary,
|
||||
# where we want to use the former, but some projects declare a dependency on the latter.
|
||||
|
||||
buildPythonPackage {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
dependencies
|
||||
optional-dependencies
|
||||
meta
|
||||
passthru
|
||||
;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
# Make a minimal pyproject.toml that can be built
|
||||
unpackPhase = ''
|
||||
cat > pyproject.toml << EOF
|
||||
[project]
|
||||
name = "${pname}"
|
||||
version = "${version}"
|
||||
dependencies = ${builtins.toJSON (map lib.getName dependencies)}
|
||||
|
||||
[project.optional-dependencies]
|
||||
${lib.optionalString (optional-dependencies != { }) (
|
||||
(lib.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList (
|
||||
group: deps: group + " = " + builtins.toJSON (map lib.getName deps)
|
||||
) optional-dependencies
|
||||
))
|
||||
)}
|
||||
|
||||
[tool.hatch.build.targets.wheel]
|
||||
bypass-selection = true
|
||||
|
||||
[build-system]
|
||||
requires = ["hatchling"]
|
||||
build-backend = "hatchling.build"
|
||||
EOF
|
||||
'';
|
||||
|
||||
build-system = [ hatchling ];
|
||||
}
|
||||
@ -61,6 +61,8 @@ let
|
||||
|
||||
removePythonPrefix = lib.removePrefix namePrefix;
|
||||
|
||||
mkPythonMetaPackage = callPackage ./meta-package.nix { };
|
||||
|
||||
# Convert derivation to a Python module.
|
||||
toPythonModule = drv:
|
||||
drv.overrideAttrs( oldAttrs: {
|
||||
@ -97,6 +99,7 @@ in {
|
||||
inherit buildPythonPackage buildPythonApplication;
|
||||
inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf;
|
||||
inherit toPythonModule toPythonApplication;
|
||||
inherit mkPythonMetaPackage;
|
||||
|
||||
python = toPythonModule python;
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = "bthome-ble";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oGhj1LsglD5d0i5ltpRZ1GvxsntTEoX6NzdrkHpml7E=";
|
||||
hash = "sha256-TlZyNGfHNKN+6tCKepLS+fbgfq3a1uzeCXl25khl6d8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libpysal";
|
||||
version = "4.12.0";
|
||||
version = "4.12.1";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "pysal";
|
||||
repo = "libpysal";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-m7jcTi51ngAXXWYJGkjMVA3KwAxL2aJysdjiS1pWEIQ=";
|
||||
hash = "sha256-snhCEKeGKKj/bTDYi6ZVv5F4b/2rz/JHIFG2IoINQ+Q=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.25.13";
|
||||
version = "1.25.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O482RKJejgg3eJe4M9U0ExuDFwFz9Fbpxvrn6re58h8=";
|
||||
hash = "sha256-1MTU/teBs2HisW0L0o5RyAAi8wlkrVFwc/K70O4YfKg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# TODO: bzr support is missing because nixpkgs switched to `breezy`
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
pname = "powerline";
|
||||
format = "setuptools";
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UIx9/IZg6Wv596wHzQb0CO6zwmQXUaFEPKBojo2LXmA=";
|
||||
hash = "sha256-snJrfUvP11lBIy6F0WtqJt9fiYm5jxMwm9u3u5XFO84=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
13
pkgs/development/python-modules/psycopg2-binary/default.nix
Normal file
13
pkgs/development/python-modules/psycopg2-binary/default.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
mkPythonMetaPackage,
|
||||
psycopg2,
|
||||
}:
|
||||
mkPythonMetaPackage {
|
||||
pname = "psycopg2-binary";
|
||||
inherit (psycopg2) version;
|
||||
dependencies = [ psycopg2 ];
|
||||
optional-dependencies = psycopg2.optional-dependencies or { };
|
||||
meta = {
|
||||
inherit (psycopg2.meta) description homepage;
|
||||
};
|
||||
}
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -36,7 +36,7 @@ buildPythonPackage rec {
|
||||
owner = "pyupio";
|
||||
repo = "safety";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pC9ruEGT3v5C5EpxIN+uZX+6sVYG4+MpXU0gt9yb+IE=";
|
||||
hash = "sha256-JWbiw9qgfDo0UMAcqIhk1Y5tW0aSaZtbVdpdaY2z+3w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -4,7 +4,7 @@ with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "check-jsonschema";
|
||||
version = "0.28.5";
|
||||
version = "0.29.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -13,7 +13,7 @@ buildPythonApplication rec {
|
||||
owner = "python-jsonschema";
|
||||
repo = "check-jsonschema";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-O2w9P/5og0cI7Ol+d5YVwLuvCjiskrRLL3V/jsYB4k4=";
|
||||
hash = "sha256-Z/v/a0zENH8K1NHCZViLBbc8gma5rTMBm8hatHhu878=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neocmakelsp";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "neocmakelsp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SDSqYfnHI6nFJrLUDApYR1nfGdcPdPihrb54gNIRkLU=";
|
||||
hash = "sha256-t9cFECz4olFQ3VOuZzqHRMuvC8df1qaF7etb9ThJiok=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Rlu2m+pbaU+EunQ7pthYPSRZo1yVF/+L114WxCv3l9c=";
|
||||
cargoHash = "sha256-m+eO2y6TNRYc9Nau5ma9qcZcj7xUdxjo34eBmuXANkU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CMake lsp based on tower-lsp and treesitter";
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kool";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kool-dev";
|
||||
repo = "kool";
|
||||
rev = version;
|
||||
hash = "sha256-oMPzDU5MNIgxg7E2lgvgXEfO4W+VrFlLThOC9OEqhWo=";
|
||||
hash = "sha256-AbE0MT55LQgDY/WZRs+kCfreLYtSyzmXkYIQmJC4Hbo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PmS96KVhe9TDmtYBx2hROLCbGMQ0OY3MN405dUmxPzk=";
|
||||
vendorHash = "sha256-wzTsd2ITwnPFc85bXoZLLb9wKvHYOgnb1FGiFXLkkiE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pscale";
|
||||
version = "0.207.0";
|
||||
version = "0.208.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "planetscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T01Vo8W21Gu2e7W87LFM/7NGsqHgWt+L4mXmPAEyB70=";
|
||||
sha256 = "sha256-q7rVTazlUmCOCv6W92uAg9/Jgkdxnl2eSxU3NSBsFZQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40=";
|
||||
@ -35,6 +35,8 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/pscale completion zsh)
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = pscale;
|
||||
};
|
||||
|
||||
@ -4,21 +4,21 @@
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, Security
|
||||
, darwin
|
||||
, withLsp ? true
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taplo";
|
||||
version = "0.9.0";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
pname = "taplo-cli";
|
||||
hash = "sha256-vvb00a6rppx9kKx+pzObT/hW/IsG6RyYFEDp9M5gvqc=";
|
||||
hash = "sha256-dNGQbaIfFmgXh2AOcaE74BTz7/jaiBgU7Y1pkg1rV7U=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oT7U9htu7J22MqLZb+YXohlB1CVGxHGQvHJu18PeLf8=";
|
||||
cargoHash = "sha256-iucjewjRCunKxKCqeZwf7bdEo7+aN9hfWPwUAJhaSq0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
buildFeatures = lib.optional withLsp "lsp";
|
||||
|
||||
@ -8,9 +8,9 @@
|
||||
, stdenv
|
||||
, curl
|
||||
, Security
|
||||
, version ? "0.2.92"
|
||||
, hash ? "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="
|
||||
, cargoHash ? "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="
|
||||
, version ? "0.2.93"
|
||||
, hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="
|
||||
, cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cfspeedtest";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "code-inflation";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rJTECX6JgIoOFpUWK4jYF6duGfhFn6SCNsHzotq5Fhg=";
|
||||
hash = "sha256-K/rotb4rgYKOF1Gvgb8uPfHCAyYqwcvyU26ZlKGxHcs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XVXHVkwkVYaETN4NAcZkoSQJJK3FxuD4uk7hll47pLM=";
|
||||
cargoHash = "sha256-clIMlnLXL4ciD1H0LNSLH/ooKIfoZy9D/RDvoSHfG+I=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unofficial CLI for speed.cloudflare.com";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aws-iam-authenticator";
|
||||
version = "0.6.25";
|
||||
version = "0.6.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-B90Bb6DZTGnE0piOf368BGOphlvqXIO+ckPShfJIX18=";
|
||||
hash = "sha256-c7JhUDnANW4QihsfCioYiCe19JfqhTYP+pZgUSV6lHQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xCNuFO+J0NXq8CPZXB0R2RmLLH27Vh/GMrBKk+mGk04=";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tuptime";
|
||||
version = "5.2.3";
|
||||
version = "5.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfmoz";
|
||||
repo = "tuptime";
|
||||
rev = version;
|
||||
sha256 = "sha256-kR+Pi7/nsRzmmvibp95wjj8/B/Q6FCDSn2A7vJ3sM94=";
|
||||
sha256 = "sha256-pYGtgv9hPBG/URD2nOWg6qJYYLtlqLW+t5mCLpzKlEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "udocker";
|
||||
version = "1.3.16";
|
||||
version = "1.3.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indigo-dc";
|
||||
repo = "udocker";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PUbNFvKaF41egGMypdkmVFCt1bWmTCWR5iQNOt/L4+Y=";
|
||||
hash = "sha256-P49fkLvdCm/Eco+nD3SGM04PRQatBzq9CHlayueQetk=";
|
||||
};
|
||||
|
||||
# crun patchelf proot runc fakechroot
|
||||
|
||||
@ -19023,9 +19023,7 @@ with pkgs;
|
||||
|
||||
szyszka = callPackage ../tools/misc/szyszka { };
|
||||
|
||||
taplo = callPackage ../development/tools/taplo {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
taplo = callPackage ../development/tools/taplo { };
|
||||
|
||||
taoup = callPackage ../tools/misc/taoup { };
|
||||
|
||||
|
||||
@ -10950,6 +10950,8 @@ self: super: with self; {
|
||||
|
||||
psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { };
|
||||
|
||||
psycopg2-binary = callPackage ../development/python-modules/psycopg2-binary { };
|
||||
|
||||
psygnal = callPackage ../development/python-modules/psygnal { };
|
||||
|
||||
ptable = callPackage ../development/python-modules/ptable { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user