mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
fc5d1c0828
43 changed files with 922 additions and 158 deletions
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
# Libraries
|
||||
/lib @edolstra @nbp @infinisil
|
||||
/lib/systems @nbp @ericson2314 @matthewbauer
|
||||
/lib/systems @alyssais @nbp @ericson2314 @matthewbauer
|
||||
/lib/generators.nix @edolstra @nbp @Profpatsch
|
||||
/lib/cli.nix @edolstra @nbp @Profpatsch
|
||||
/lib/debug.nix @edolstra @nbp @Profpatsch
|
||||
|
|
|
|||
2
.github/workflows/basic-eval.yml
vendored
2
.github/workflows/basic-eval.yml
vendored
|
|
@ -15,6 +15,6 @@ jobs:
|
|||
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
# explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
|
||||
- run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'
|
||||
|
|
|
|||
2
.github/workflows/editorconfig.yml
vendored
2
.github/workflows/editorconfig.yml
vendored
|
|
@ -28,7 +28,7 @@ jobs:
|
|||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
if: env.PR_DIFF
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
if: env.PR_DIFF
|
||||
with:
|
||||
# nixpkgs commit is pinned so that it doesn't break
|
||||
|
|
|
|||
2
.github/workflows/manual-nixos.yml
vendored
2
.github/workflows/manual-nixos.yml
vendored
|
|
@ -18,7 +18,7 @@ jobs:
|
|||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
|
|
|||
2
.github/workflows/manual-nixpkgs.yml
vendored
2
.github/workflows/manual-nixpkgs.yml
vendored
|
|
@ -18,7 +18,7 @@ jobs:
|
|||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v13
|
||||
- uses: cachix/install-nix-action@v14
|
||||
with:
|
||||
# explicitly enable sandbox
|
||||
extra_nix_config: sandbox = true
|
||||
|
|
|
|||
2
.github/workflows/nixos-manual.yml
vendored
2
.github/workflows/nixos-manual.yml
vendored
|
|
@ -19,7 +19,7 @@ jobs:
|
|||
with:
|
||||
# pull_request_target checks out the base branch by default
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
- uses: cachix/install-nix-action@v12
|
||||
- uses: cachix/install-nix-action@v14
|
||||
- name: Check DocBook files generated from Markdown are consistent
|
||||
run: |
|
||||
nixos/doc/manual/md-to-db.sh
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ rec {
|
|||
else if final.isMips then "mips"
|
||||
else if final.isPower then "powerpc"
|
||||
else if final.isRiscV then "riscv"
|
||||
else if final.isS390 then "s390"
|
||||
else final.parsed.cpu.name;
|
||||
|
||||
qemuArch =
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ let
|
|||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
"armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux"
|
||||
"powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
|
||||
"riscv64-linux" "s390-linux" "x86_64-linux"
|
||||
"riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
|
||||
|
||||
# MMIXware
|
||||
"mmix-mmixware"
|
||||
|
|
@ -41,7 +41,8 @@ let
|
|||
# none
|
||||
"aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none"
|
||||
"msp430-none" "or1k-none" "m68k-none" "powerpc-none"
|
||||
"riscv32-none" "riscv64-none" "s390-none" "vc4-none" "x86_64-none"
|
||||
"riscv32-none" "riscv64-none" "s390-none" "s390x-none" "vc4-none"
|
||||
"x86_64-none"
|
||||
|
||||
# OpenBSD
|
||||
"i686-openbsd" "x86_64-openbsd"
|
||||
|
|
|
|||
|
|
@ -152,6 +152,10 @@ rec {
|
|||
config = "s390-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
s390x = {
|
||||
config = "s390x-unknown-linux-gnu";
|
||||
};
|
||||
|
||||
arm-embedded = {
|
||||
config = "arm-none-eabi";
|
||||
libc = "newlib";
|
||||
|
|
|
|||
|
|
@ -106,6 +106,7 @@ rec {
|
|||
riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
|
||||
|
||||
s390 = { bits = 32; significantByte = bigEndian; family = "s390"; };
|
||||
s390x = { bits = 64; significantByte = bigEndian; family = "s390"; };
|
||||
|
||||
sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; };
|
||||
sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; };
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests {
|
|||
testredox = mseteq redox [ "x86_64-redox" ];
|
||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ];
|
||||
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
|
||||
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
||||
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ let
|
|||
substituteInPlace $out/dry-activate --subst-var out
|
||||
chmod u+x $out/activate $out/dry-activate
|
||||
unset activationScript dryActivationScript
|
||||
${pkgs.runtimeShell} -n $out/activate
|
||||
${pkgs.runtimeShell} -n $out/dry-activate
|
||||
|
||||
cp ${config.system.build.bootStage2} $out/init
|
||||
substituteInPlace $out/init --subst-var-by systemConfig $out
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.17.2.2";
|
||||
version = "0.17.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "1k3grbd3wydy5gv6d8x35skv1v97lhh6awd9i87im9lz4kn8ywkd";
|
||||
sha256 = "1d8y5yqyw0db2jdv9mwkczwm2qcwhzyslvq994yq5rvs4vkd8xjg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero";
|
||||
version = "0.17.2.0";
|
||||
version = "0.17.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6";
|
||||
sha256 = "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,20 +3,20 @@
|
|||
}:
|
||||
let
|
||||
pname = "josm";
|
||||
version = "18118";
|
||||
version = "18193";
|
||||
srcs = {
|
||||
jar = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym";
|
||||
sha256 = "sha256-55lrPOlQQx1rmmIzBJ522zSia7RmVNTeHuE20vE1d6A=";
|
||||
};
|
||||
macosx = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip";
|
||||
sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397";
|
||||
sha256 = "sha256-OoDX5tPTLrUgGfBa11dFVyeuXSai8QJNeQLWwot2ksk=";
|
||||
};
|
||||
pkg = fetchsvn {
|
||||
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
|
||||
rev = version;
|
||||
sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1";
|
||||
sha256 = "sha256-uXXS+urNCrGnalIAj49Bp1S+pXya/XhdfEWvPmcKKII=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mailspring";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
|
||||
sha256 = "mfpwDYRpFULD9Th8tI5yqb5RYWZJHarbWYpfKS3Q6mE=";
|
||||
sha256 = "sha256-o7w2XHd5FnPYt9j8IIGy6OgKtdeNb/qZ+EiXGEn0NUQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch";
|
||||
version = "0.32.3";
|
||||
version = "0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
|
||||
sha256 = "114bbyjl2ppmy4pw0b5zwmi7lxiz6xd1k6zq0qcgdv7ahkwgybxy";
|
||||
hash = "sha256-iD4EW0v6LEjJpGcQYqQGA6f2Flck3VRhi+66EAVJ0mw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
|||
doxygen # (optional) api docs
|
||||
pythonPackages.sphinx # (optional) documentation -> doc/INSTALL
|
||||
texinfo # (optional) documentation -> doc/INSTALL
|
||||
pythonPackages.cffi
|
||||
] ++ lib.optional withEmacs emacs;
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3Packages
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages
|
||||
, x11Support ? !stdenv.isDarwin
|
||||
, xclip ? null
|
||||
, pbcopy ? null
|
||||
|
|
@ -21,6 +21,15 @@ python3Packages.buildPythonApplication rec {
|
|||
sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when version >0.9.2 is released
|
||||
(fetchpatch {
|
||||
url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch";
|
||||
sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5";
|
||||
name = "replace-decodestring-with-decodebytes.patch";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = with python3Packages; [
|
||||
python
|
||||
wrapPython
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "singularity";
|
||||
version = "3.8.2";
|
||||
version = "3.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz";
|
||||
sha256 = "sha256-mWYR3sQCtNNyuLlFbdnsHLQ3EtCFAuRV84UhvRmYVtM=";
|
||||
sha256 = "sha256-LiLrnuG3P91RuHgxSfDk2DwNLYoMHt9gNBV9UO7vuDU=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/sylabs/singularity";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zimg";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sekrit-twc";
|
||||
repo = "zimg";
|
||||
rev = "release-${version}";
|
||||
sha256 = "19qim6vyfas0m09piiw0pw7i0xjzi8vs6bx716gz472nflsg1604";
|
||||
sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -267,6 +267,18 @@ let
|
|||
meta.mainProgram = "postcss";
|
||||
};
|
||||
|
||||
prisma = super.prisma.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
--prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \
|
||||
--prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \
|
||||
--prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node"
|
||||
--prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \
|
||||
--prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt"
|
||||
'';
|
||||
};
|
||||
|
||||
pulp = super.pulp.override {
|
||||
# tries to install purescript
|
||||
npmFlags = "--ignore-scripts";
|
||||
|
|
|
|||
|
|
@ -207,6 +207,7 @@
|
|||
, "postcss-cli"
|
||||
, "prettier"
|
||||
, "prettier-plugin-toml"
|
||||
, "prisma"
|
||||
, "pscid"
|
||||
, "pulp"
|
||||
, "purescript-language-server"
|
||||
|
|
|
|||
155
pkgs/development/node-packages/node-packages.nix
generated
155
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -5206,6 +5206,15 @@ let
|
|||
sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA==";
|
||||
};
|
||||
};
|
||||
"@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" = {
|
||||
name = "_at_prisma_slash_engines";
|
||||
packageName = "@prisma/engines";
|
||||
version = "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz";
|
||||
sha512 = "Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg==";
|
||||
};
|
||||
};
|
||||
"@protobufjs/aspromise-1.1.2" = {
|
||||
name = "_at_protobufjs_slash_aspromise";
|
||||
packageName = "@protobufjs/aspromise";
|
||||
|
|
@ -5566,13 +5575,13 @@ let
|
|||
sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog==";
|
||||
};
|
||||
};
|
||||
"@serverless/utils-5.8.1" = {
|
||||
"@serverless/utils-5.9.0" = {
|
||||
name = "_at_serverless_slash_utils";
|
||||
packageName = "@serverless/utils";
|
||||
version = "5.8.1";
|
||||
version = "5.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.8.1.tgz";
|
||||
sha512 = "tUOvlGq9xpLrq6dguH4bjAJqycoOUx7aVJIjbX4T7MZxuovxg/x2ZXc+Hrfqq0t+jRKVm78ZjHCjCASJDxbYPA==";
|
||||
url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.9.0.tgz";
|
||||
sha512 = "cAPOndJ78N5o3Q4WVXfy/z1bE5QPCUwT2DPj06bd3DGHV3api+NZLeOECG4AdcyPREw/9w1oNxw9555q903KwA==";
|
||||
};
|
||||
};
|
||||
"@serverless/utils-china-1.1.4" = {
|
||||
|
|
@ -25487,15 +25496,6 @@ let
|
|||
sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw==";
|
||||
};
|
||||
};
|
||||
"fast-safe-stringify-2.1.0" = {
|
||||
name = "fast-safe-stringify";
|
||||
packageName = "fast-safe-stringify";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.0.tgz";
|
||||
sha512 = "xHSIyDJTOVQjtMBGcUokl3tpaOKgTyVTjlHj255V4Q4J1oho3cnrWrf5sCx8z1jq7gzNMv8y0PH53pYYuZUFPQ==";
|
||||
};
|
||||
};
|
||||
"fast-safe-stringify-2.1.1" = {
|
||||
name = "fast-safe-stringify";
|
||||
packageName = "fast-safe-stringify";
|
||||
|
|
@ -34012,13 +34012,13 @@ let
|
|||
sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==";
|
||||
};
|
||||
};
|
||||
"jest-worker-27.1.0" = {
|
||||
"jest-worker-27.1.1" = {
|
||||
name = "jest-worker";
|
||||
packageName = "jest-worker";
|
||||
version = "27.1.0";
|
||||
version = "27.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.0.tgz";
|
||||
sha512 = "mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg==";
|
||||
url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz";
|
||||
sha512 = "XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA==";
|
||||
};
|
||||
};
|
||||
"jimp-compact-0.16.1" = {
|
||||
|
|
@ -56409,6 +56409,33 @@ let
|
|||
sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39";
|
||||
};
|
||||
};
|
||||
"ssb-bendy-butt-0.12.3" = {
|
||||
name = "ssb-bendy-butt";
|
||||
packageName = "ssb-bendy-butt";
|
||||
version = "0.12.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.3.tgz";
|
||||
sha512 = "fo3Sspdr+cjQzq8F+EKRJiibm06Mt/pzmtAjf0HEOl/pZPTHGFolfsGtZlU4U+RuKOqqZMhxzTXNAwoJ+trdDw==";
|
||||
};
|
||||
};
|
||||
"ssb-bfe-3.1.1" = {
|
||||
name = "ssb-bfe";
|
||||
packageName = "ssb-bfe";
|
||||
version = "3.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz";
|
||||
sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA==";
|
||||
};
|
||||
};
|
||||
"ssb-bfe-spec-0.3.0" = {
|
||||
name = "ssb-bfe-spec";
|
||||
packageName = "ssb-bfe-spec";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz";
|
||||
sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q==";
|
||||
};
|
||||
};
|
||||
"ssb-blobs-1.2.2" = {
|
||||
name = "ssb-blobs";
|
||||
packageName = "ssb-blobs";
|
||||
|
|
@ -56463,13 +56490,13 @@ let
|
|||
sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung==";
|
||||
};
|
||||
};
|
||||
"ssb-db2-2.3.1" = {
|
||||
"ssb-db2-2.4.0" = {
|
||||
name = "ssb-db2";
|
||||
packageName = "ssb-db2";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.3.1.tgz";
|
||||
sha512 = "SE/GGoLn29JJeeo/SLGzjtPj5xvafn6so8fBNqM0Hfnk03DwZ7iFG0PuB8L5CMold3sLLDXFjuzdacKf85848Q==";
|
||||
url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.4.0.tgz";
|
||||
sha512 = "UMd6XqBGTHBNPduyEc0ynO+lkCn/8/NTedzDz9XRYQsqk4ed2Js0cWhqeREv0Bz+upfCMmPQBBHASPBw47XTOA==";
|
||||
};
|
||||
};
|
||||
"ssb-ebt-5.6.7" = {
|
||||
|
|
@ -56706,6 +56733,15 @@ let
|
|||
sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg==";
|
||||
};
|
||||
};
|
||||
"ssb-typescript-2.5.0" = {
|
||||
name = "ssb-typescript";
|
||||
packageName = "ssb-typescript";
|
||||
version = "2.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz";
|
||||
sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA==";
|
||||
};
|
||||
};
|
||||
"ssb-unix-socket-1.0.0" = {
|
||||
name = "ssb-unix-socket";
|
||||
packageName = "ssb-unix-socket";
|
||||
|
|
@ -56715,6 +56751,15 @@ let
|
|||
sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA==";
|
||||
};
|
||||
};
|
||||
"ssb-uri2-1.5.2" = {
|
||||
name = "ssb-uri2";
|
||||
packageName = "ssb-uri2";
|
||||
version = "1.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.5.2.tgz";
|
||||
sha512 = "jlsN7w6/toFjcRZLDkCC3nq6+rKeS7NhUxZ+xGS1ASltenkudcZvdgczRb+L11ObFND4VCohkO21lVSAJV8hCQ==";
|
||||
};
|
||||
};
|
||||
"ssb-validate-4.1.4" = {
|
||||
name = "ssb-validate";
|
||||
packageName = "ssb-validate";
|
||||
|
|
@ -69137,7 +69182,7 @@ in
|
|||
sources."is-stream-2.0.1"
|
||||
sources."is-unicode-supported-0.1.0"
|
||||
sources."isexe-2.0.0"
|
||||
(sources."jest-worker-27.1.0" // {
|
||||
(sources."jest-worker-27.1.1" // {
|
||||
dependencies = [
|
||||
sources."supports-color-8.1.1"
|
||||
];
|
||||
|
|
@ -72419,7 +72464,7 @@ in
|
|||
sources."es-to-primitive-1.2.1"
|
||||
sources."events-3.3.0"
|
||||
sources."evp_bytestokey-1.0.3"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."foreach-2.0.5"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.1"
|
||||
|
|
@ -77348,7 +77393,7 @@ in
|
|||
sources."core-util-is-1.0.3"
|
||||
sources."enabled-2.0.0"
|
||||
sources."eventemitter3-4.0.7"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fecha-4.2.1"
|
||||
sources."fn.name-1.1.0"
|
||||
sources."follow-redirects-1.14.3"
|
||||
|
|
@ -84476,7 +84521,7 @@ in
|
|||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-glob-3.2.7"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fastq-1.12.0"
|
||||
sources."faye-websocket-0.10.0"
|
||||
sources."fecha-4.2.1"
|
||||
|
|
@ -87339,7 +87384,7 @@ in
|
|||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-levenshtein-2.0.6"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fast-text-encoding-1.0.3"
|
||||
(sources."fast-url-parser-1.1.3" // {
|
||||
dependencies = [
|
||||
|
|
@ -90667,7 +90712,7 @@ in
|
|||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-glob-3.2.7"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fastq-1.12.0"
|
||||
sources."figlet-1.5.0"
|
||||
sources."figures-3.2.0"
|
||||
|
|
@ -99007,7 +99052,7 @@ in
|
|||
sources."extsprintf-1.3.0"
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fb-watchman-2.0.1"
|
||||
sources."figgy-pudding-3.5.2"
|
||||
sources."file-uri-to-path-1.0.0"
|
||||
|
|
@ -100607,7 +100652,7 @@ in
|
|||
sources."diagnostics-1.1.1"
|
||||
sources."enabled-1.0.2"
|
||||
sources."env-variable-0.0.6"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fecha-2.3.3"
|
||||
sources."inherits-2.0.4"
|
||||
sources."is-arrayish-0.3.2"
|
||||
|
|
@ -101526,7 +101571,7 @@ in
|
|||
sources."fast-equals-2.0.3"
|
||||
sources."fast-glob-2.2.7"
|
||||
sources."fast-levenshtein-2.0.6"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fastq-1.12.0"
|
||||
sources."fd-slicer-1.1.0"
|
||||
sources."fecha-4.2.1"
|
||||
|
|
@ -107710,6 +107755,27 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
prisma = nodeEnv.buildNodePackage {
|
||||
name = "prisma";
|
||||
packageName = "prisma";
|
||||
version = "3.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-3.0.1.tgz";
|
||||
sha512 = "ENmYAopd56nkds5/IOSTGixbkbUN2QdEzB4cp/mtaGB/G0OArbP6cnbA/9u02Pe29RdErbNOoIdCGASjpItJwQ==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Prisma is an open-source database toolkit. It includes a JavaScript/TypeScript ORM for Node.js, migrations and a modern GUI to view and edit the data in your database. You can use Prisma in new projects or add it to an existing one.";
|
||||
homepage = "https://www.prisma.io";
|
||||
license = "Apache-2.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
pscid = nodeEnv.buildNodePackage {
|
||||
name = "pscid";
|
||||
packageName = "pscid";
|
||||
|
|
@ -107848,7 +107914,7 @@ in
|
|||
sources."es6-promise-3.3.1"
|
||||
sources."events-2.1.0"
|
||||
sources."evp_bytestokey-1.0.3"
|
||||
sources."fast-safe-stringify-2.1.0"
|
||||
sources."fast-safe-stringify-2.1.1"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."function-bind-1.1.1"
|
||||
sources."gaze-1.1.3"
|
||||
|
|
@ -111890,7 +111956,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."@serverless/template-1.1.4"
|
||||
(sources."@serverless/utils-5.8.1" // {
|
||||
(sources."@serverless/utils-5.9.0" // {
|
||||
dependencies = [
|
||||
sources."cli-progress-footer-2.0.0"
|
||||
sources."get-stream-6.0.1"
|
||||
|
|
@ -113339,10 +113405,10 @@ in
|
|||
snyk = nodeEnv.buildNodePackage {
|
||||
name = "snyk";
|
||||
packageName = "snyk";
|
||||
version = "1.698.0";
|
||||
version = "1.700.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/snyk/-/snyk-1.698.0.tgz";
|
||||
sha512 = "ivOZ1VCRwGvtOG6c3etxLPdwRjjnXvg9aSXRP7oOSZDQvEWouKDh9HpvkTHm8mZgFACw6hU1cmBseHyMfpYnkw==";
|
||||
url = "https://registry.npmjs.org/snyk/-/snyk-1.700.0.tgz";
|
||||
sha512 = "nhhgv2Dh8Wh/qrt5gjS+RrQjEUfwEOU4W6KZnnQrmVAfFwZ4Uis+pXcoTTJtsg/xJ0/eXV/v2UxA6PKPkYMeOw==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
|
|
@ -113646,6 +113712,7 @@ in
|
|||
sources."base64-js-1.5.1"
|
||||
sources."base64-url-2.3.3"
|
||||
sources."bash-color-0.0.4"
|
||||
sources."bencode-2.0.2"
|
||||
sources."binary-extensions-1.13.1"
|
||||
sources."binary-search-1.3.6"
|
||||
sources."binary-search-bounds-2.0.5"
|
||||
|
|
@ -114155,6 +114222,7 @@ in
|
|||
sources."push-stream-11.0.1"
|
||||
];
|
||||
})
|
||||
sources."querystringify-2.2.0"
|
||||
sources."quicktask-1.0.1"
|
||||
sources."railroad-diagrams-1.0.0"
|
||||
sources."randexp-0.4.6"
|
||||
|
|
@ -114250,6 +114318,7 @@ in
|
|||
sources."remove-trailing-separator-1.1.0"
|
||||
sources."repeat-element-1.1.4"
|
||||
sources."repeat-string-1.6.1"
|
||||
sources."requires-port-1.0.0"
|
||||
sources."resolve-1.20.0"
|
||||
sources."resolve-url-0.2.1"
|
||||
sources."restore-cursor-1.0.1"
|
||||
|
|
@ -114323,12 +114392,19 @@ in
|
|||
sources."source-map-url-0.4.1"
|
||||
sources."split-buffer-1.0.0"
|
||||
sources."split-string-3.1.0"
|
||||
(sources."ssb-bendy-butt-0.12.3" // {
|
||||
dependencies = [
|
||||
sources."ssb-keys-8.2.0"
|
||||
];
|
||||
})
|
||||
sources."ssb-bfe-3.1.1"
|
||||
sources."ssb-bfe-spec-0.3.0"
|
||||
sources."ssb-blobs-1.2.2"
|
||||
sources."ssb-caps-1.1.0"
|
||||
sources."ssb-client-4.9.0"
|
||||
sources."ssb-config-3.4.5"
|
||||
sources."ssb-db-19.2.0"
|
||||
(sources."ssb-db2-2.3.1" // {
|
||||
(sources."ssb-db2-2.4.0" // {
|
||||
dependencies = [
|
||||
sources."abstract-leveldown-6.2.3"
|
||||
(sources."flumecodec-0.0.1" // {
|
||||
|
|
@ -114382,7 +114458,9 @@ in
|
|||
sources."ssb-query-2.4.5"
|
||||
sources."ssb-ref-2.16.0"
|
||||
sources."ssb-replicate-1.3.3"
|
||||
sources."ssb-typescript-2.5.0"
|
||||
sources."ssb-unix-socket-1.0.0"
|
||||
sources."ssb-uri2-1.5.2"
|
||||
(sources."ssb-validate-4.1.4" // {
|
||||
dependencies = [
|
||||
sources."ssb-keys-8.2.0"
|
||||
|
|
@ -114475,6 +114553,7 @@ in
|
|||
})
|
||||
sources."untildify-2.1.0"
|
||||
sources."urix-0.1.0"
|
||||
sources."url-parse-1.5.3"
|
||||
sources."use-3.1.1"
|
||||
sources."user-home-2.0.0"
|
||||
sources."utf8-byte-length-1.0.4"
|
||||
|
|
@ -120319,7 +120398,7 @@ in
|
|||
sources."isarray-0.0.1"
|
||||
sources."isexe-2.0.0"
|
||||
sources."isobject-3.0.1"
|
||||
sources."jest-worker-27.1.0"
|
||||
sources."jest-worker-27.1.1"
|
||||
sources."js-yaml-4.0.0"
|
||||
sources."json-parse-better-errors-1.0.2"
|
||||
sources."json-schema-traverse-0.4.1"
|
||||
|
|
@ -122627,7 +122706,7 @@ in
|
|||
sources."glob-to-regexp-0.4.1"
|
||||
sources."graceful-fs-4.2.8"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."jest-worker-27.1.0"
|
||||
sources."jest-worker-27.1.1"
|
||||
sources."json-parse-better-errors-1.0.2"
|
||||
sources."json-schema-traverse-0.4.1"
|
||||
sources."loader-runner-4.2.0"
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dpath";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
disabled = isPy27; # uses python3 imports
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64=";
|
||||
sha256 = "sha256-p6icMudH3zqfKkRrt5dHLjWb66UzlRW3pvZbIzsqMac=";
|
||||
};
|
||||
|
||||
# use pytest as nosetests hangs
|
||||
|
|
|
|||
|
|
@ -1,30 +1,27 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, envoy-utils
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, pytest-asyncio
|
||||
, pytest-raises
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, respx
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "envoy-reader";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesserizzo";
|
||||
repo = "envoy_reader";
|
||||
rev = version;
|
||||
sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6";
|
||||
sha256 = "sha256-nPB1Fvb1qwLHeFkXP2jXixD2ZGA09MtS1qXRhYGt0fM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pytest-runner
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
envoy-utils
|
||||
httpx
|
||||
];
|
||||
|
||||
|
|
@ -35,6 +32,11 @@ buildPythonPackage rec {
|
|||
respx
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest-runner>=5.2" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "envoy_reader" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
35
pkgs/development/python-modules/envoy-utils/default.nix
Normal file
35
pkgs/development/python-modules/envoy-utils/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, zeroconf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "envoy-utils";
|
||||
version = "0.0.1";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "envoy_utils";
|
||||
inherit version;
|
||||
sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
zeroconf
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "envoy_utils" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python utilities for the Enphase Envoy";
|
||||
homepage = "https://pypi.org/project/envoy-utils/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,6 @@
|
|||
, google-cloud-testutils
|
||||
, libcst
|
||||
, proto-plus
|
||||
, pytest
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
|
|
@ -24,11 +23,6 @@ buildPythonPackage rec {
|
|||
sha256 = "7d7218ffdd17d64184e1de69ef016f1f070bb0c888785510c4731948b078067d";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
grpc-google-iam-v1
|
||||
google-api-core
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-os-config";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d12622901fb2ef5b736606fd00e77900105944c35d737ff794a59fd9a3d71325";
|
||||
sha256 = "69764c406c8e1a95b66a84c042b7023c13eaef3bf79e493e60edd9ce62e8f2e4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-storage";
|
||||
version = "1.42.0";
|
||||
version = "1.42.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae";
|
||||
sha256 = "b37ec5b0cd69aacb09270674c4c14873898cbc77624d17fef41ec0cb08004866";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ google-auth google-crc32c requests ];
|
||||
|
||||
checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
|
||||
checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
|
||||
|
||||
preCheck = ''
|
||||
# prevent shadowing imports
|
||||
|
|
|
|||
22
pkgs/development/python-modules/qmk-dotty-dict/default.nix
Normal file
22
pkgs/development/python-modules/qmk-dotty-dict/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ buildPythonPackage, fetchPypi, lib, pytest, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qmk_dotty_dict";
|
||||
version = "1.3.0.post1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dictionary wrapper for quick access to deeply nested keys";
|
||||
homepage = "https://github.com/pawelzny/dotty_dict";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ babariviere ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "youless-api";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "jongsoftdev";
|
||||
repo = "youless-python-bridge";
|
||||
rev = version;
|
||||
sha256 = "18hymahpblq87i7lv479sizj8mgxawjhj31g4j1lyna1mds3887k";
|
||||
sha256 = "sha256-Vywzd8wZG4eI/U69fPYuLpF54zAeuCv3Q81z5UcMGjc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@
|
|||
, zlib
|
||||
}:
|
||||
let
|
||||
pname = "github-actions-runner";
|
||||
version = "2.279.0";
|
||||
|
||||
deps = (import ./deps.nix { inherit fetchurl; });
|
||||
nugetPackages = map
|
||||
(x: {
|
||||
|
|
@ -29,63 +26,20 @@ let
|
|||
path = "${x}";
|
||||
})
|
||||
deps;
|
||||
nugetSource = linkFarm "${pname}-${version}-packages" nugetPackages;
|
||||
nugetSource = linkFarm "nuget-packages" nugetPackages;
|
||||
|
||||
dotnetSdk = dotnetCorePackages.sdk_3_1;
|
||||
runtimeId = "linux-x64";
|
||||
|
||||
disabledTest = [
|
||||
# Self-updating is patched out, hence this test will fail
|
||||
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage"
|
||||
] ++ map
|
||||
# Online tests
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
|
||||
[
|
||||
"CompositeActionWithActionfile_CompositeContainerNested"
|
||||
"CompositeActionWithActionfile_CompositePrestepNested"
|
||||
"CompositeActionWithActionfile_MaxLimit"
|
||||
"CompositeActionWithActionfile_Node"
|
||||
"DownloadActionFromGraph"
|
||||
"DownloadActionFromGraph_Legacy"
|
||||
"NotPullOrBuildImagesMultipleTimes"
|
||||
"NotPullOrBuildImagesMultipleTimes_Legacy"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfileAndDockerfile"
|
||||
"RepositoryActionWithActionfileAndDockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerHubImage"
|
||||
"RepositoryActionWithActionfile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfile_Dockerfile"
|
||||
"RepositoryActionWithActionfile_Dockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"
|
||||
"RepositoryActionWithActionfile_Node"
|
||||
"RepositoryActionWithActionfile_Node_Legacy"
|
||||
"RepositoryActionWithDockerfile"
|
||||
"RepositoryActionWithDockerfile_Legacy"
|
||||
"RepositoryActionWithDockerfileInRelativePath"
|
||||
"RepositoryActionWithDockerfileInRelativePath_Legacy"
|
||||
"RepositoryActionWithDockerfilePrepareActions_Repository"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
|
||||
] ++ map
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}")
|
||||
[
|
||||
"EnsureDotnetsdkBashDownloadScriptUpToDate"
|
||||
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
|
||||
];
|
||||
testFilterXml = lib.concatStringsSep "&" disabledTest;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version;
|
||||
pname = "github-runner";
|
||||
version = "2.281.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version}
|
||||
sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms=";
|
||||
rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version}
|
||||
sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -125,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
# Disable specific tests
|
||||
substituteInPlace src/dir.proj \
|
||||
--replace 'dotnet test Test/Test.csproj' \
|
||||
"dotnet test Test/Test.csproj --filter '${testFilterXml}'"
|
||||
"dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'"
|
||||
|
||||
# We don't use a Git checkout
|
||||
substituteInPlace src/dir.proj \
|
||||
|
|
@ -180,6 +134,49 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
disabledTests = [
|
||||
# Self-updating is patched out, hence this test will fail
|
||||
"FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage"
|
||||
] ++ map
|
||||
# Online tests
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}")
|
||||
[
|
||||
"CompositeActionWithActionfile_CompositeContainerNested"
|
||||
"CompositeActionWithActionfile_CompositePrestepNested"
|
||||
"CompositeActionWithActionfile_MaxLimit"
|
||||
"CompositeActionWithActionfile_Node"
|
||||
"DownloadActionFromGraph"
|
||||
"DownloadActionFromGraph_Legacy"
|
||||
"NotPullOrBuildImagesMultipleTimes"
|
||||
"NotPullOrBuildImagesMultipleTimes_Legacy"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage"
|
||||
"RepositoryActionWithActionYamlFile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfileAndDockerfile"
|
||||
"RepositoryActionWithActionfileAndDockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerHubImage"
|
||||
"RepositoryActionWithActionfile_DockerHubImage_Legacy"
|
||||
"RepositoryActionWithActionfile_Dockerfile"
|
||||
"RepositoryActionWithActionfile_Dockerfile_Legacy"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath"
|
||||
"RepositoryActionWithActionfile_DockerfileRelativePath_Legacy"
|
||||
"RepositoryActionWithActionfile_Node"
|
||||
"RepositoryActionWithActionfile_Node_Legacy"
|
||||
"RepositoryActionWithDockerfile"
|
||||
"RepositoryActionWithDockerfile_Legacy"
|
||||
"RepositoryActionWithDockerfileInRelativePath"
|
||||
"RepositoryActionWithDockerfileInRelativePath_Legacy"
|
||||
"RepositoryActionWithDockerfilePrepareActions_Repository"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node"
|
||||
"RepositoryActionWithInvalidWrapperActionfile_Node_Legacy"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps"
|
||||
"RepositoryActionWithWrapperActionfile_PreSteps_Legacy"
|
||||
] ++ map
|
||||
(x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}")
|
||||
[
|
||||
"EnsureDotnetsdkBashDownloadScriptUpToDate"
|
||||
"EnsureDotnetsdkPowershellDownloadScriptUpToDate"
|
||||
];
|
||||
|
||||
checkInputs = [ git ];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
@ -240,6 +237,10 @@ stdenv.mkDerivation rec {
|
|||
# Stripping breaks the binaries
|
||||
dontStrip = true;
|
||||
|
||||
preFixup = ''
|
||||
patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
fix_rpath() {
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1
|
||||
|
|
|
|||
61
pkgs/development/tools/database/prisma-engines/default.nix
Normal file
61
pkgs/development/tools/database/prisma-engines/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ fetchFromGitHub
|
||||
, lib
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "prisma-engines";
|
||||
version = "2.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prisma";
|
||||
repo = "prisma-engines";
|
||||
rev = version;
|
||||
sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Remove test from compilation targets:
|
||||
# they add time to an already long compilation and some fail out-of-the-box.
|
||||
./no_tests.patch
|
||||
];
|
||||
|
||||
# Use system openssl.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM=";
|
||||
|
||||
outputs = [ "out" "lib" "bin" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl protobuf ];
|
||||
|
||||
preBuild = ''
|
||||
export OPENSSL_DIR=${lib.getDev openssl}
|
||||
export OPENSSL_LIB_DIR=${openssl.out}/lib
|
||||
|
||||
export PROTOC=${protobuf}/bin/protoc
|
||||
export PROTOC_INCLUDE="${protobuf}/include";
|
||||
|
||||
export SQLITE_MAX_VARIABLE_NUMBER=250000
|
||||
export SQLITE_MAX_EXPR_DEPTH=10000
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node
|
||||
'';
|
||||
|
||||
# Tests are long to compile
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of engines that power the core stack for Prisma";
|
||||
homepage = "https://www.prisma.io/";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ pamplemousse ];
|
||||
};
|
||||
}
|
||||
459
pkgs/development/tools/database/prisma-engines/no_tests.patch
Normal file
459
pkgs/development/tools/database/prisma-engines/no_tests.patch
Normal file
|
|
@ -0,0 +1,459 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 1070c7a30..310f7302f 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -479,18 +479,6 @@ version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
-[[package]]
|
||||
-name = "bitvec"
|
||||
-version = "0.19.5"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321"
|
||||
-dependencies = [
|
||||
- "funty",
|
||||
- "radium",
|
||||
- "tap",
|
||||
- "wyz",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
version = "0.7.3"
|
||||
@@ -706,19 +694,6 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "console"
|
||||
-version = "0.14.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45"
|
||||
-dependencies = [
|
||||
- "encode_unicode",
|
||||
- "lazy_static",
|
||||
- "libc",
|
||||
- "terminal_size",
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "const_fn"
|
||||
version = "0.4.5"
|
||||
@@ -1011,24 +986,12 @@ dependencies = [
|
||||
"uuid",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "dtoa"
|
||||
-version = "0.4.8"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
|
||||
-
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
||||
|
||||
-[[package]]
|
||||
-name = "encode_unicode"
|
||||
-version = "0.3.6"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
|
||||
-
|
||||
[[package]]
|
||||
name = "encoding"
|
||||
version = "0.2.33"
|
||||
@@ -1114,18 +1077,6 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "enum_dispatch"
|
||||
-version = "0.3.5"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e"
|
||||
-dependencies = [
|
||||
- "once_cell",
|
||||
- "proc-macro2",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "enumflags2"
|
||||
version = "0.7.1"
|
||||
@@ -1261,12 +1212,6 @@ dependencies = [
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "funty"
|
||||
-version = "1.1.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
|
||||
-
|
||||
[[package]]
|
||||
name = "futures"
|
||||
version = "0.3.13"
|
||||
@@ -1573,15 +1518,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "html-escape"
|
||||
-version = "0.2.7"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233"
|
||||
-dependencies = [
|
||||
- "utf8-width",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "http"
|
||||
version = "0.2.3"
|
||||
@@ -1744,21 +1680,6 @@ version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
|
||||
|
||||
-[[package]]
|
||||
-name = "insta"
|
||||
-version = "1.7.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244"
|
||||
-dependencies = [
|
||||
- "console",
|
||||
- "lazy_static",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "serde_yaml",
|
||||
- "similar",
|
||||
- "uuid",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "instant"
|
||||
version = "0.1.9"
|
||||
@@ -1804,34 +1725,6 @@ dependencies = [
|
||||
"user-facing-errors",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "introspection-engine-tests"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "barrel",
|
||||
- "datamodel",
|
||||
- "datamodel-connector",
|
||||
- "enumflags2",
|
||||
- "expect-test",
|
||||
- "indoc",
|
||||
- "introspection-connector",
|
||||
- "introspection-core",
|
||||
- "migration-connector",
|
||||
- "pretty_assertions",
|
||||
- "quaint",
|
||||
- "serde_json",
|
||||
- "sql-datamodel-connector",
|
||||
- "sql-introspection-connector",
|
||||
- "sql-migration-connector",
|
||||
- "sql-schema-describer",
|
||||
- "test-macros",
|
||||
- "test-setup",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-futures",
|
||||
- "user-facing-errors",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "ipconfig"
|
||||
version = "0.2.2"
|
||||
@@ -2178,39 +2071,6 @@ dependencies = [
|
||||
"user-facing-errors",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "migration-engine-tests"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "bigdecimal",
|
||||
- "chrono",
|
||||
- "connection-string",
|
||||
- "datamodel",
|
||||
- "datamodel-connector",
|
||||
- "enumflags2",
|
||||
- "expect-test",
|
||||
- "indoc",
|
||||
- "migration-connector",
|
||||
- "migration-core",
|
||||
- "once_cell",
|
||||
- "pretty_assertions",
|
||||
- "prisma-value",
|
||||
- "quaint",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "sql-datamodel-connector",
|
||||
- "sql-migration-connector",
|
||||
- "sql-schema-describer",
|
||||
- "tempfile",
|
||||
- "test-macros",
|
||||
- "test-setup",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-futures",
|
||||
- "url",
|
||||
- "user-facing-errors",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.3.16"
|
||||
@@ -2517,19 +2377,6 @@ dependencies = [
|
||||
"socket2 0.4.0",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "nom"
|
||||
-version = "6.1.2"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2"
|
||||
-dependencies = [
|
||||
- "bitvec",
|
||||
- "funty",
|
||||
- "lexical-core",
|
||||
- "memchr",
|
||||
- "version_check",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "ntapi"
|
||||
version = "0.3.6"
|
||||
@@ -2773,18 +2620,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "parse-hyperlinks"
|
||||
-version = "0.19.6"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff"
|
||||
-dependencies = [
|
||||
- "html-escape",
|
||||
- "nom",
|
||||
- "percent-encoding",
|
||||
- "thiserror",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "pbkdf2"
|
||||
version = "0.7.5"
|
||||
@@ -3388,72 +3223,6 @@ dependencies = [
|
||||
"user-facing-errors",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "query-engine-tests"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "anyhow",
|
||||
- "base64 0.13.0",
|
||||
- "chrono",
|
||||
- "colored",
|
||||
- "datamodel-connector",
|
||||
- "indoc",
|
||||
- "insta",
|
||||
- "prisma-value",
|
||||
- "query-test-macros",
|
||||
- "query-tests-setup",
|
||||
- "serde_json",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-futures",
|
||||
- "uuid",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "query-test-macros"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "darling",
|
||||
- "indoc",
|
||||
- "itertools 0.10.0",
|
||||
- "proc-macro2",
|
||||
- "query-tests-setup",
|
||||
- "quote",
|
||||
- "syn",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "query-tests-setup"
|
||||
-version = "0.1.0"
|
||||
-dependencies = [
|
||||
- "async-trait",
|
||||
- "colored",
|
||||
- "datamodel",
|
||||
- "datamodel-connector",
|
||||
- "enum_dispatch",
|
||||
- "enumflags2",
|
||||
- "indoc",
|
||||
- "itertools 0.10.0",
|
||||
- "lazy_static",
|
||||
- "migration-core",
|
||||
- "mongodb-datamodel-connector",
|
||||
- "nom",
|
||||
- "parse-hyperlinks",
|
||||
- "prisma-models",
|
||||
- "query-core",
|
||||
- "regex",
|
||||
- "request-handlers",
|
||||
- "serde",
|
||||
- "serde_json",
|
||||
- "sql-datamodel-connector",
|
||||
- "thiserror",
|
||||
- "tokio",
|
||||
- "tracing",
|
||||
- "tracing-error",
|
||||
- "tracing-futures",
|
||||
- "tracing-subscriber",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
@@ -3469,12 +3238,6 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "radium"
|
||||
-version = "0.5.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
|
||||
-
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.7.3"
|
||||
@@ -3922,18 +3685,6 @@ dependencies = [
|
||||
"syn",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "serde_yaml"
|
||||
-version = "0.8.17"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
|
||||
-dependencies = [
|
||||
- "dtoa",
|
||||
- "linked-hash-map",
|
||||
- "serde",
|
||||
- "yaml-rust",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "serial_test"
|
||||
version = "0.5.1"
|
||||
@@ -4028,12 +3779,6 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "similar"
|
||||
-version = "1.3.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec"
|
||||
-
|
||||
[[package]]
|
||||
name = "simple-mutex"
|
||||
version = "1.1.5"
|
||||
@@ -4372,12 +4117,6 @@ version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
|
||||
|
||||
-[[package]]
|
||||
-name = "tap"
|
||||
-version = "1.0.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
-
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.2.0"
|
||||
@@ -4392,16 +4131,6 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "terminal_size"
|
||||
-version = "0.1.16"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406"
|
||||
-dependencies = [
|
||||
- "libc",
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "test-cli"
|
||||
version = "0.1.0"
|
||||
@@ -5094,12 +4823,6 @@ dependencies = [
|
||||
"user-facing-error-macros",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "utf8-width"
|
||||
-version = "0.1.4"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa"
|
||||
-
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "0.8.2"
|
||||
@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "wyz"
|
||||
-version = "0.2.0"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
|
||||
-
|
||||
-[[package]]
|
||||
-name = "yaml-rust"
|
||||
-version = "0.4.5"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
|
||||
-dependencies = [
|
||||
- "linked-hash-map",
|
||||
-]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 2411986ea..2eb2bb82d 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -3,7 +3,6 @@ members = [
|
||||
"introspection-engine/connectors/introspection-connector",
|
||||
"introspection-engine/connectors/sql-introspection-connector",
|
||||
"introspection-engine/core",
|
||||
- "introspection-engine/introspection-engine-tests",
|
||||
"libs/datamodel/connectors/datamodel-connector",
|
||||
"libs/datamodel/connectors/sql-datamodel-connector",
|
||||
"libs/datamodel/connectors/mongodb-datamodel-connector",
|
||||
@@ -12,14 +11,12 @@ members = [
|
||||
"migration-engine/connectors/sql-migration-connector",
|
||||
"migration-engine/connectors/mongodb-migration-connector",
|
||||
"migration-engine/core",
|
||||
- "migration-engine/migration-engine-tests",
|
||||
"query-engine/connectors/query-connector",
|
||||
"query-engine/connectors/sql-query-connector",
|
||||
"query-engine/connectors/mongodb-query-connector",
|
||||
"query-engine/core",
|
||||
"query-engine/query-engine",
|
||||
"query-engine/query-engine-node-api",
|
||||
- "query-engine/connector-test-kit-rs/query-engine-tests",
|
||||
"query-engine/request-handlers",
|
||||
"prisma-fmt",
|
||||
"libs/datamodel/core",
|
||||
25
pkgs/development/tools/mask/default.nix
Normal file
25
pkgs/development/tools/mask/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mask";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jakedeichert";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc";
|
||||
};
|
||||
|
||||
cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963";
|
||||
|
||||
# tests require mask to be installed
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A CLI task runner defined by a simple markdown file";
|
||||
homepage = "https://github.com/jakedeichert/mask";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
||||
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
|
||||
, autoreconfHook, nixosTests
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "knot-dns";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c";
|
||||
sha256 = "580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
|
@ -26,11 +25,6 @@ stdenv.mkDerivation rec {
|
|||
# They are later created from NixOS itself.
|
||||
./dont-create-run-time-dirs.patch
|
||||
./runtime-deps.patch
|
||||
# rename task_t to worker_task_t to fix redefinition issues on (aach64-)darwin
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/a70b718085f9b97e556970444313c37a702a60f7.diff";
|
||||
sha256 = "0m776pb9iga0lj2gadk23shfrcfrsrzlyaj8800klw7xh6qq32bm";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchpatch
|
||||
}:
|
||||
{ lib, python3, fetchpatch, writeText }:
|
||||
|
||||
let
|
||||
inherit (python3.pkgs) buildPythonApplication fetchPypi;
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
setuppy = writeText "setup.py" ''
|
||||
from setuptools import setup
|
||||
setup()
|
||||
'';
|
||||
in buildPythonApplication rec {
|
||||
pname = "qmk";
|
||||
version = "0.0.52";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ=";
|
||||
sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonApplication rec {
|
|||
appdirs
|
||||
argcomplete
|
||||
colorama
|
||||
dotty-dict
|
||||
qmk-dotty-dict
|
||||
hid
|
||||
hjson
|
||||
jsonschema
|
||||
|
|
@ -36,6 +36,10 @@ buildPythonApplication rec {
|
|||
pyusb
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
cp ${setuppy} setup.py
|
||||
'';
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -57,6 +61,6 @@ buildPythonApplication rec {
|
|||
- ... and many more!
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bhipple ];
|
||||
maintainers = with maintainers; [ bhipple babariviere ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-09-03";
|
||||
version = "2021-09-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9roj5/DfbbN98jy/aO1Ua4pTMxgr4UbqXFicN2ONQgE=";
|
||||
sha256 = "sha256-q6XALX0sGzgUm2PRwlDfcQHZFH+8ExageMahXJ+EYdM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
22
pkgs/tools/text/csview/default.nix
Normal file
22
pkgs/tools/text/csview/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csview";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "18bz12yn85h9vj0b18iaziix9km2iwh8gwfs93fddjv6kg87p38q";
|
||||
};
|
||||
|
||||
cargoSha256 = "1my6gl8zq5k7clzapgbf1mmcgq8mmdbhl250rdd1fvfd59wkrwra";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high performance csv viewer with cjk/emoji support";
|
||||
homepage = "https://github.com/wfxr/csview";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
22
pkgs/tools/text/tv/default.nix
Normal file
22
pkgs/tools/text/tv/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ fetchFromGitHub, lib, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tv";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uzimaru0000";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07gcs64j468213jxcjjv9vywzvfair7gbaiqzqm9wwsdgjyw0wwc";
|
||||
};
|
||||
|
||||
cargoSha256 = "00fi7wimr0rihf6qx20r77w85w2i55kn823gp283lsszbw1z8as9";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Format json into table view";
|
||||
homepage = "https://github.com/uzimaru0000/tv";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -302,6 +302,8 @@ with pkgs;
|
|||
|
||||
mix2nix = callPackage ../development/tools/mix2nix/default.nix { };
|
||||
|
||||
prisma-engines = callPackage ../development/tools/database/prisma-engines { };
|
||||
|
||||
proto-contrib = callPackage ../development/tools/proto-contrib {};
|
||||
|
||||
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
|
||||
|
|
@ -2442,6 +2444,8 @@ with pkgs;
|
|||
|
||||
csv2odf = callPackage ../applications/office/csv2odf { };
|
||||
|
||||
csview = callPackage ../tools/text/csview { };
|
||||
|
||||
csvkit = callPackage ../tools/text/csvkit { };
|
||||
|
||||
csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { };
|
||||
|
|
@ -6601,6 +6605,8 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
mask = callPackage ../development/tools/mask { };
|
||||
|
||||
mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { };
|
||||
|
||||
/* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails
|
||||
|
|
@ -9707,6 +9713,8 @@ with pkgs;
|
|||
|
||||
turses = callPackage ../applications/networking/instant-messengers/turses { };
|
||||
|
||||
tv = callPackage ../tools/text/tv { };
|
||||
|
||||
tvm = callPackage ../development/compilers/tvm { };
|
||||
|
||||
oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { };
|
||||
|
|
|
|||
|
|
@ -2370,6 +2370,8 @@ in {
|
|||
|
||||
envoy-reader = callPackage ../development/python-modules/envoy-reader { };
|
||||
|
||||
envoy-utils = callPackage ../development/python-modules/envoy-utils { };
|
||||
|
||||
enzyme = callPackage ../development/python-modules/enzyme { };
|
||||
|
||||
epc = callPackage ../development/python-modules/epc { };
|
||||
|
|
@ -7573,6 +7575,8 @@ in {
|
|||
|
||||
queuelib = callPackage ../development/python-modules/queuelib { };
|
||||
|
||||
qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {};
|
||||
|
||||
r2pipe = callPackage ../development/python-modules/r2pipe { };
|
||||
|
||||
rabbitpy = callPackage ../development/python-modules/rabbitpy { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue