Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d6b8789005
|
|
@ -2673,6 +2673,16 @@
|
|||
githubId = 5561189;
|
||||
name = "Cody Opel";
|
||||
};
|
||||
cofob = {
|
||||
name = "Egor Ternovoy";
|
||||
email = "cofob@riseup.net";
|
||||
matrix = "@cofob:matrix.org";
|
||||
github = "cofob";
|
||||
githubId = 49928332;
|
||||
keys = [{
|
||||
fingerprint = "5F3D 9D3D ECE0 8651 DE14 D29F ACAD 4265 E193 794D";
|
||||
}];
|
||||
};
|
||||
Cogitri = {
|
||||
email = "oss@cogitri.dev";
|
||||
github = "Cogitri";
|
||||
|
|
|
|||
|
|
@ -1419,5 +1419,5 @@ in
|
|||
];
|
||||
|
||||
meta.doc = ./sourcehut.xml;
|
||||
meta.maintainers = with maintainers; [ julm tomberek ];
|
||||
meta.maintainers = with maintainers; [ tomberek ];
|
||||
}
|
||||
|
|
|
|||
1910
pkgs/applications/backup/proxmox-backup-client/Cargo.lock
generated
Normal file
1910
pkgs/applications/backup/proxmox-backup-client/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
70
pkgs/applications/backup/proxmox-backup-client/default.nix
Normal file
70
pkgs/applications/backup/proxmox-backup-client/default.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{ lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl, libxcrypt }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proxmox-backup-client";
|
||||
version = "2.2.1";
|
||||
|
||||
srcs = [
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
||||
rev = "v${version}";
|
||||
name = pname;
|
||||
hash = "sha256-uOKQe/BzO69f/ggEPoZQ2Rn3quytQrUeH7be19QV3KI=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox.git";
|
||||
rev = "43b4440ef015d846161657490b18cf6ac7600fc4";
|
||||
name = "proxmox";
|
||||
hash = "sha256-05Z+IRRIioFGn+iAYG04DyNsgw9gQrJ6qAArpCwoIb0=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
||||
rev = "d162ef9039878b871e2aa11b7d9a373ae512e2d1";
|
||||
name = "proxmox-fuse";
|
||||
hash = "sha256-w33ViWpBkCkMAhZVXiOdqnGOn/tddNRgzn71WioTnBU=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/pxar.git";
|
||||
rev = "6f3f889e98c5f4e60c3b2c6bce73bd506b548c21";
|
||||
name = "pxar";
|
||||
hash = "sha256-GtNq6+O1xnxuR7b4TTWLFxcsejRyadSlk85H8C+yUGA=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = pname;
|
||||
|
||||
cargoPatches = [
|
||||
./re-route-dependencies.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
rm .cargo/config
|
||||
'';
|
||||
|
||||
cargoLock = {
|
||||
lockFileContents = builtins.readFile ./Cargo.lock;
|
||||
};
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package=proxmox-backup-client"
|
||||
"--bin=proxmox-backup-client"
|
||||
"--bin=dump-catalog-shell-cli"
|
||||
|
||||
"--package=pxar-bin"
|
||||
"--bin=pxar"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
buildInputs = [ openssl fuse3 libuuid acl libxcrypt ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The command line client for Proxmox Backup Server";
|
||||
homepage = "https://pbs.proxmox.com/docs/backup-client.html";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ cofob ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
Date: Wed, 18 May 2022 08:41:14 +0200
|
||||
Subject: [PATCH] re-route dependencies not available on crates.io to git repos
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
---
|
||||
Cargo.toml | 112 +++++++-------------------------------------------
|
||||
1 file changed, 15 insertions(+), 97 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 41980292..e7daaad5 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -25,94 +25,12 @@ members = [
|
||||
"pbs-config",
|
||||
"pbs-datastore",
|
||||
"pbs-fuse-loop",
|
||||
- "proxmox-rest-server",
|
||||
- "proxmox-rrd",
|
||||
- "pbs-tape",
|
||||
"pbs-tools",
|
||||
|
||||
- "proxmox-backup-banner",
|
||||
"proxmox-backup-client",
|
||||
- "proxmox-file-restore",
|
||||
- "proxmox-restore-daemon",
|
||||
"pxar-bin",
|
||||
]
|
||||
|
||||
-[lib]
|
||||
-name = "proxmox_backup"
|
||||
-path = "src/lib.rs"
|
||||
-
|
||||
-[dependencies]
|
||||
-apt-pkg-native = "0.3.2"
|
||||
-base64 = "0.13"
|
||||
-bitflags = "1.2.1"
|
||||
-bytes = "1.0"
|
||||
-cidr = "0.2.1"
|
||||
-crc32fast = "1"
|
||||
-endian_trait = { version = "0.6", features = ["arrays"] }
|
||||
-flate2 = "1.0"
|
||||
-anyhow = "1.0"
|
||||
-thiserror = "1.0"
|
||||
-futures = "0.3"
|
||||
-h2 = { version = "0.3", features = [ "stream" ] }
|
||||
-handlebars = "3.0"
|
||||
-hex = "0.4.3"
|
||||
-http = "0.2"
|
||||
-hyper = { version = "0.14", features = [ "full" ] }
|
||||
-lazy_static = "1.4"
|
||||
-libc = "0.2"
|
||||
-log = "0.4.17"
|
||||
-nix = "0.19.1"
|
||||
-num-traits = "0.2"
|
||||
-once_cell = "1.3.1"
|
||||
-openssl = "0.10.38" # currently patched!
|
||||
-pam = "0.7"
|
||||
-pam-sys = "0.5"
|
||||
-percent-encoding = "2.1"
|
||||
-regex = "1.5.5"
|
||||
-rustyline = "7"
|
||||
-serde = { version = "1.0", features = ["derive"] }
|
||||
-serde_json = "1.0"
|
||||
-siphasher = "0.3"
|
||||
-syslog = "4.0"
|
||||
-tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
|
||||
-tokio-openssl = "0.6.1"
|
||||
-tokio-stream = "0.1.0"
|
||||
-tokio-util = { version = "0.6", features = [ "codec", "io" ] }
|
||||
-tower-service = "0.3.0"
|
||||
-udev = "0.4"
|
||||
-url = "2.1"
|
||||
-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
|
||||
-walkdir = "2"
|
||||
-xdg = "2.2"
|
||||
-nom = "5.1"
|
||||
-crossbeam-channel = "0.5"
|
||||
-
|
||||
-# Used only by examples currently:
|
||||
-zstd = { version = "0.6", features = [ "bindgen" ] }
|
||||
-
|
||||
-pathpatterns = "0.1.2"
|
||||
-pxar = { version = "0.10.1", features = [ "tokio-io" ] }
|
||||
-
|
||||
-proxmox-http = { version = "0.6.1", features = [ "client", "http-helpers", "websocket" ] }
|
||||
-proxmox-io = "1"
|
||||
-proxmox-lang = "1.1"
|
||||
-proxmox-router = { version = "1.2.2", features = [ "cli" ] }
|
||||
-proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] }
|
||||
-proxmox-section-config = "1"
|
||||
-proxmox-tfa = { version = "2", features = [ "api", "api-types" ] }
|
||||
-proxmox-time = "1.1.2"
|
||||
-proxmox-uuid = "1"
|
||||
-proxmox-serde = "0.1"
|
||||
-proxmox-shared-memory = "0.2"
|
||||
-proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
|
||||
-proxmox-compression = "0.1"
|
||||
-
|
||||
-
|
||||
-proxmox-acme-rs = "0.4"
|
||||
-proxmox-apt = "0.8.0"
|
||||
-proxmox-async = "0.4"
|
||||
-proxmox-openid = "0.9.0"
|
||||
-
|
||||
pbs-api-types = { path = "pbs-api-types" }
|
||||
pbs-buildcfg = { path = "pbs-buildcfg" }
|
||||
pbs-client = { path = "pbs-client" }
|
||||
@@ -126,22 +44,23 @@ pbs-tape = { path = "pbs-tape" }
|
||||
# Local path overrides
|
||||
# NOTE: You must run `cargo update` after changing this for it to take effect!
|
||||
[patch.crates-io]
|
||||
-#proxmox = { path = "../proxmox/proxmox" }
|
||||
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
+proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
-#pxar = { path = "../pxar" }
|
||||
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
+pxar = { path = "../pxar" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
35
pkgs/applications/networking/cluster/temporalite/default.nix
Normal file
35
pkgs/applications/networking/cluster/temporalite/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "temporalite";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rLEkWg5LNVb7i/2IARKGuP9ugaVJA9pwYbKLm0QLmOc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vjuwh/HRRYfB6J49rfJxif12nYPnbBodWF9hTiGygS8=";
|
||||
|
||||
subPackages = [ "cmd/temporalite" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/temporalite/ui_test.go \
|
||||
--replace "TestNewUIConfigWithMissingConfigFile" "SkipNewUIConfigWithMissingConfigFile"
|
||||
|
||||
substituteInPlace cmd/temporalite/mtls_test.go \
|
||||
--replace "TestMTLSConfig" "SkipMTLSConfig"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An experimental distribution of Temporal that runs as a single process";
|
||||
homepage = "https://github.com/temporalio/temporalite";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lucperkins ];
|
||||
};
|
||||
}
|
||||
|
|
@ -147,13 +147,14 @@
|
|||
"version": "1.0.0"
|
||||
},
|
||||
"baiducloud": {
|
||||
"hash": "sha256-tVvpWXKJyhiuyFnDMPvTPBhWUx169PjvZL2iQXDuK1s=",
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-mM4wikawrXdePX2ZemsjyoHrf0LQ0gwoUspcbvBUSeA=",
|
||||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.16.2",
|
||||
"vendorHash": null,
|
||||
"version": "1.16.2"
|
||||
"rev": "v1.16.3",
|
||||
"vendorHash": "sha256-UxVRz0Nhz6jqXPlAAJZ+GJFu30JJ4hYvVi5OlXInE0g=",
|
||||
"version": "1.16.3"
|
||||
},
|
||||
"bigip": {
|
||||
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
|
||||
|
|
@ -231,13 +232,13 @@
|
|||
"version": "1.20.0"
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-uItV3BTB3bY8NrjD63oUWZMB0gEscEN4Y6aDTuDQW7c=",
|
||||
"hash": "sha256-DqGHPD1CnkIkABB0sB90zE/mVxo0aXQwu4Et7apuM1A=",
|
||||
"owner": "cloudflare",
|
||||
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
|
||||
"repo": "terraform-provider-cloudflare",
|
||||
"rev": "v3.26.0",
|
||||
"vendorHash": "sha256-pifWJoCbV0bIDzDihdvpC3k5d615HTsYHqVV3s50euk=",
|
||||
"version": "3.26.0"
|
||||
"rev": "v3.27.0",
|
||||
"vendorHash": "sha256-tpOyqFpO1jMEfXkXgodGEnFVGMqeAqsU5oou60lqcUE=",
|
||||
"version": "3.27.0"
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-VfGB0NkT36oYT5F1fh1N/2rlZdfhk+K76AXNh0NkO50=",
|
||||
|
|
@ -633,13 +634,13 @@
|
|||
"version": "4.0.1"
|
||||
},
|
||||
"ksyun": {
|
||||
"hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=",
|
||||
"hash": "sha256-xmBpDYN1MRQ9cyIOqHMAD7RucRkOKmwnmzjIsjxA7VQ=",
|
||||
"owner": "kingsoftcloud",
|
||||
"provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun",
|
||||
"repo": "terraform-provider-ksyun",
|
||||
"rev": "v1.3.55",
|
||||
"rev": "v1.3.56",
|
||||
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ=",
|
||||
"version": "1.3.55"
|
||||
"version": "1.3.56"
|
||||
},
|
||||
"kubectl": {
|
||||
"hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=",
|
||||
|
|
@ -714,13 +715,14 @@
|
|||
"version": "2.0.3"
|
||||
},
|
||||
"lxd": {
|
||||
"hash": "sha256-rNqlPyKpBNaIRtiNHB8U8jowWhqdQtDIMxreZ5Dfm3E=",
|
||||
"hash": "sha256-x0f8kP7OsgSD8d9vu99vp7Xq3szwLKxoAZdUCJc8B7A=",
|
||||
"owner": "terraform-lxd",
|
||||
"provider-source-address": "registry.terraform.io/terraform-lxd/lxd",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v1.7.2",
|
||||
"vendorHash": "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc=",
|
||||
"version": "1.7.2"
|
||||
"rev": "v1.7.3",
|
||||
"vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=",
|
||||
"version": "1.7.3"
|
||||
},
|
||||
"mailgun": {
|
||||
"hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=",
|
||||
|
|
|
|||
|
|
@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
|
|||
libXrender
|
||||
libXtst
|
||||
nspr
|
||||
nss
|
||||
libxcb
|
||||
pango
|
||||
libXScrnSaver
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@ buildPythonPackage rec {
|
|||
--replace "all: api worker" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
redis
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ buildPythonPackage rec {
|
|||
patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
propagatedNativeBuildInputs = [
|
||||
sassc
|
||||
nodejs
|
||||
];
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ let
|
|||
listssrht = self.callPackage ./lists.nix { };
|
||||
mansrht = self.callPackage ./man.nix { };
|
||||
metasrht = self.callPackage ./meta.nix { };
|
||||
pagessrht = self.callPackage ./pages.nix { };
|
||||
pastesrht = self.callPackage ./paste.nix { };
|
||||
todosrht = self.callPackage ./todo.nix { };
|
||||
|
||||
|
|
@ -41,7 +40,7 @@ with python.pkgs; recurseIntoAttrs {
|
|||
listssrht = toPythonApplication listssrht;
|
||||
mansrht = toPythonApplication mansrht;
|
||||
metasrht = toPythonApplication metasrht;
|
||||
pagessrht = pagessrht;
|
||||
pagessrht = callPackage ./pages.nix { };
|
||||
pastesrht = toPythonApplication pastesrht;
|
||||
todosrht = toPythonApplication todosrht;
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-bZ4ZKohMozZIyP0TUgxETOECib4XGUv29+Mg8ZsoMf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pyyaml
|
||||
|
|
|
|||
|
|
@ -63,8 +63,6 @@ buildPythonPackage rec {
|
|||
--replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pygit2
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@ buildPythonPackage rec {
|
|||
vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
hglib
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, fetchFromSourcehut
|
||||
, buildPythonPackage
|
||||
, srht
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -15,10 +16,9 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pyyaml
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -28,15 +28,13 @@ buildPythonPackage rec {
|
|||
pname = "listssrht-api";
|
||||
modRoot = "api";
|
||||
vendorSha256 = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0=";
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip;});
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace "all: api" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pygit2
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pygit2
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@ buildPythonPackage rec {
|
|||
--replace "all: api" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pgpy
|
||||
srht
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ buildPythonPackage rec {
|
|||
--replace "all: api" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
pyyaml
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
redis
|
||||
|
|
|
|||
|
|
@ -33,9 +33,7 @@ buildPythonPackage rec {
|
|||
pname = "todosrht-api";
|
||||
modRoot = "api";
|
||||
vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0=";
|
||||
} // import ./fix-gqlgen-trimpath.nix {inherit unzip;});
|
||||
|
||||
nativeBuildInputs = srht.nativeBuildInputs;
|
||||
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
|
||||
|
||||
propagatedBuildInputs = [
|
||||
srht
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" "";
|
|||
jruby = stdenv.mkDerivation rec {
|
||||
pname = "jruby";
|
||||
|
||||
version = "9.3.8.0";
|
||||
version = "9.3.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
|
||||
sha256 = "sha256-Z0pNEwhjH6pfASTQHXPrHtyJNG7n3iHHDhQwW9YbRt8=";
|
||||
sha256 = "sha256-JR5t2NHS+CkiyMd414V+G++C/lyiz3e8CTVkIdCwWrg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, gfortran, lhapdf, python3, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gfortran, lhapdf, python3, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apfel";
|
||||
|
|
@ -11,13 +11,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o=";
|
||||
};
|
||||
|
||||
# needed for aarch64-darwin
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ gfortran lhapdf python3 zlib ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A PDF Evolution Library";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://apfel.mi.infn.it/";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
|
|
|
|||
|
|
@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
|
|||
"-DRAPIDFUZZ_BUILD_TESTING=ON"
|
||||
];
|
||||
|
||||
CXXFLAGS = lib.optionals stdenv.cc.isClang [
|
||||
# error: no member named 'fill' in namespace 'std'
|
||||
"-include algorithm"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
catch2_3
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,35 +1,66 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, mock
|
||||
, cachelib
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, flask-sqlalchemy
|
||||
, httpx
|
||||
, mock
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, starlette
|
||||
, werkzeug
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.1";
|
||||
pname = "authlib";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lepture";
|
||||
repo = "authlib";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-2uzb3rhEDMgH2QZ0yUdI1c4qLJT5XIDmOV/1mV/5lnc=";
|
||||
hash = "sha256-UTsQRAgmYu4BwT0WWE6XOjTYyGWZIt8bMH9qJ8KLOWA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cryptography requests ];
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [ mock pytest ];
|
||||
checkInputs = [
|
||||
cachelib
|
||||
flask
|
||||
flask-sqlalchemy
|
||||
httpx
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
starlette
|
||||
werkzeug
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
PYTHONPATH=$PWD:$PYTHONPATH pytest tests/{core,files}
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"authlib"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# Django tests require a running instance
|
||||
"tests/django/"
|
||||
"tests/clients/test_django/"
|
||||
# Unsupported encryption algorithm
|
||||
"tests/jose/test_chacha20.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for building OAuth and OpenID Connect servers";
|
||||
homepage = "https://github.com/lepture/authlib";
|
||||
description = "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included.";
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,63 +2,50 @@
|
|||
, buildPythonPackage
|
||||
, cssselect
|
||||
, fetchPypi
|
||||
, functools32
|
||||
, isPy27
|
||||
, lxml
|
||||
, packaging
|
||||
, psutil
|
||||
, pytestCheckHook
|
||||
, six
|
||||
, pythonOlder
|
||||
, w3lib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "parsel";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh";
|
||||
hash = "sha256-AlQTPLAwTeE/zEhXu4IU/3DWmIcnYfpr6DdOG7vVgZI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner",' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cssselect
|
||||
lxml
|
||||
six
|
||||
packaging
|
||||
w3lib
|
||||
] ++ lib.optionals isPy27 [
|
||||
functools32
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
psutil
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Test are out-dated and are failing (AssertionError: Lists differ: ...)
|
||||
# https://github.com/scrapy/parsel/pull/174
|
||||
"test_differences_parsing_xml_vs_html"
|
||||
"test_nested_selectors"
|
||||
"test_re"
|
||||
"test_replacement_null_char_from_body"
|
||||
"test_select_on_text_nodes"
|
||||
"test_selector_get_alias"
|
||||
"test_selector_getall_alias"
|
||||
"test_selector_over_text"
|
||||
"test_selectorlist_get_alias"
|
||||
"test_selectorlist_getall_alias"
|
||||
"test_slicing"
|
||||
"test_text_pseudo_element"
|
||||
pythonImportsCheck = [
|
||||
"parsel"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "parsel" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/scrapy/parsel";
|
||||
description = "Python library to extract data from HTML and XML using XPath and CSS selectors";
|
||||
homepage = "https://github.com/scrapy/parsel";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "7.15.0";
|
||||
version = "7.15.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-raRrEK1Ub5yV4T2onZj+Y+pmtm09z3KxGmtqK6TnlSk=";
|
||||
hash = "sha256-Ud4NbiTO7ki+l8hPzGP7DlReRA0XK0OJhDZRPNLWm7A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.7.0";
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
pname = "agola";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "agola-io";
|
||||
repo = "agola";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AiD7mVogWk/TOYy7Ed1aT31h1kbrRwseue5qc3wLOCI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Y3ck7Qdo9uq3YuLzZUe+RZkKQqWpSko3q+f4bfkSz6g=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-X agola.io/agola/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
tags = [
|
||||
"sqlite_unlock_notify"
|
||||
];
|
||||
|
||||
# somehow the tests get stuck
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Agola: CI/CD Redefined ";
|
||||
homepage = "https://agola.io";
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "14.20.1";
|
||||
sha256 = "sha256-NlBX6mYZI8v6cb3XqNCs6d3/jSLUMa2SNV+EM87P8U0=";
|
||||
version = "14.21.0";
|
||||
sha256 = "sha256-O0vawbrMxUuu4uPbyre7Y1Ikxxbudu5Jqk9vVMKPeZE=";
|
||||
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "blightmud";
|
||||
version = "4.0.0";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-80uTwbZjXoQnfP0VWM/CnvaHyRsPA1puASJwBm3GqJk=";
|
||||
sha256 = "sha256-AGKlkNpNdyD2cJGs350/076Qd/8M/nmRAaHJyefFRgw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uXr/5G0TH3EKqPwUKTwOguBExBEYB1D3/hr8nzOwCcM=";
|
||||
cargoSha256 = "sha256-RI0J60DCspJ501VR3TpqD6pjzO6//Qq1NgQb45d32ks=";
|
||||
|
||||
buildFeatures = lib.optional withTTS "tts";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.15.8";
|
||||
version = "0.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CXQjQ+6COHDDYmThpIXIqW+LDsiysdpnyo4TvcsGHpU=";
|
||||
sha256 = "sha256-b5d4tjXOrVRhkSTaUYkPmeG1kOcqeIF2pBFZgLYbUR8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sfxoa3quMPaHc4pPInf1wnIwkWirnuGyCA76Ta7HDMU=";
|
||||
cargoSha256 = "sha256-QxLIUIigBDfpiuAN4UwXbDdrx4ImxMK5tsoP6OBBY58=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gnPplWCP3Dky+CzWumeGC/XAHhHWFt/h4WiFoCLzHMU=";
|
||||
sha256 = "sha256-JytK4wmQepSSml6jmP2TWRICt/s26E56ntACpFdiTDU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3gpA0EGdcVeUCU7iozpjQJM/iid34PRm3gpxUiwzDEk=";
|
||||
|
|
|
|||
|
|
@ -1224,6 +1224,8 @@ with pkgs;
|
|||
|
||||
agi = callPackage ../tools/graphics/agi { };
|
||||
|
||||
agola = callPackage ../development/tools/continuous-integration/agola { };
|
||||
|
||||
agrep = callPackage ../tools/text/agrep { };
|
||||
|
||||
aha = callPackage ../tools/text/aha { };
|
||||
|
|
@ -4756,6 +4758,8 @@ with pkgs;
|
|||
|
||||
precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { };
|
||||
|
||||
proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { };
|
||||
|
||||
pueue = callPackage ../applications/misc/pueue {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
};
|
||||
|
|
@ -32138,6 +32142,8 @@ with pkgs;
|
|||
|
||||
temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { };
|
||||
|
||||
temporalite = callPackage ../applications/networking/cluster/temporalite { };
|
||||
|
||||
tenacity = callPackage ../applications/audio/tenacity { };
|
||||
|
||||
tendermint = callPackage ../tools/networking/tendermint { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue