alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-09-25 18:01:44 +00:00 committed by GitHub
parent 088018e25e 4dc28faf21
commit 5dd6e3a959
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 284 additions and 509 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -736,6 +736,12 @@
githubId = 1771266;
name = "Vo Anh Duy";
};
anirrudh = {
email = "anik597@gmail.com";
github = "anirrudh";
githubId = 6091755;
name = "Anirrudh Krishnan";
};
ankhers = {
email = "me@ankhers.dev";
github = "ankhers";

39
nixos/modules/services/search/meilisearch.md Normal file
View file

@ -0,0 +1,39 @@
# Meilisearch {#module-services-meilisearch}
Meilisearch is a lightweight, fast and powerful search engine. Think elastic search with a much smaller footprint.
## Quickstart
the minimum to start meilisearch is
```nix
services.meilisearch.enable = true;
```
this will start the http server included with meilisearch on port 7700.
test with `curl -X GET 'http://localhost:7700/health'`
## Usage
you first need to add documents to an index before you can search for documents.
### Add a documents to the `movies` index
`curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]'`
### Search documents in the `movies` index
`curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }'` (note the typo is intentional and there to demonstrate the typo tolerant capabilities)
## Defaults
- The default nixos package doesn't come with the [dashboard](https://docs.meilisearch.com/learn/getting_started/quick_start.html#search), since the dashboard features makes some assets downloads at compile time.
- Anonimized Analytics sent to meilisearch are disabled by default.
- Default deployment is development mode. It doesn't require a secret master key. All routes are not protected and accessible.
## Missing
- the snapshot feature is not yet configurable from the module, it's just a matter of adding the relevant environment variables.

5
nixos/modules/services/search/meilisearch.nix
View file

@ -8,7 +8,10 @@ let
in
{
meta.maintainers = with maintainers; [ Br1ght0ne ];
meta.maintainers = with maintainers; [ Br1ght0ne happysalada ];
# Don't edit the docbook xml directly, edit the md and generate it:
# `pandoc meilisearch.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > meilisearch.xml`
meta.doc = ./meilisearch.xml;
###### interface

85
nixos/modules/services/search/meilisearch.xml Normal file
View file

@ -0,0 +1,85 @@
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-meilisearch">
<title>Meilisearch</title>
<para>
Meilisearch is a lightweight, fast and powerful search engine. Think
elastic search with a much smaller footprint.
</para>
<section xml:id="quickstart">
<title>Quickstart</title>
<para>
the minimum to start meilisearch is
</para>
<programlisting language="bash">
services.meilisearch.enable = true;
</programlisting>
<para>
this will start the http server included with meilisearch on port
7700.
</para>
<para>
test with
<literal>curl -X GET 'http://localhost:7700/health'</literal>
</para>
</section>
<section xml:id="usage">
<title>Usage</title>
<para>
you first need to add documents to an index before you can search
for documents.
</para>
<section xml:id="add-a-documents-to-the-movies-index">
<title>Add a documents to the <literal>movies</literal>
index</title>
<para>
<literal>curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{&quot;id&quot;: &quot;123&quot;, &quot;title&quot;: &quot;Superman&quot;}, {&quot;id&quot;: 234, &quot;title&quot;: &quot;Batman&quot;}]'</literal>
</para>
</section>
<section xml:id="search-documents-in-the-movies-index">
<title>Search documents in the <literal>movies</literal>
index</title>
<para>
<literal>curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ &quot;q&quot;: &quot;botman&quot; }'</literal>
(note the typo is intentional and there to demonstrate the typo
tolerant capabilities)
</para>
</section>
</section>
<section xml:id="defaults">
<title>Defaults</title>
<itemizedlist>
<listitem>
<para>
The default nixos package doesn’t come with the
<link xlink:href="https://docs.meilisearch.com/learn/getting_started/quick_start.html#search">dashboard</link>,
since the dashboard features makes some assets downloads at
compile time.
</para>
</listitem>
<listitem>
<para>
Anonimized Analytics sent to meilisearch are disabled by
default.
</para>
</listitem>
<listitem>
<para>
Default deployment is development mode. It doesn’t require a
secret master key. All routes are not protected and
accessible.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="missing">
<title>Missing</title>
<itemizedlist spacing="compact">
<listitem>
<para>
the snapshot feature is not yet configurable from the module,
it’s just a matter of adding the relevant environment
variables.
</para>
</listitem>
</itemizedlist>
</section>
</chapter>

9
nixos/modules/system/boot/networkd.nix
View file

@ -384,6 +384,7 @@ let
"AllMulticast"
"Unmanaged"
"RequiredForOnline"
"ActivationPolicy"
])
(assertMacAddress "MACAddress")
(assertByteFormat "MTUBytes")
@ -402,6 +403,14 @@ let
"enslaved"
"routable"
]))
(assertValueOneOf "ActivationPolicy" ([
"up"
"always-up"
"manual"
"always-down"
"down"
"bound"
]))
];
sectionNetwork = checkUnitConfig "Network" [

11
pkgs/applications/misc/navi/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "navi";
version = "2.16.0";
version = "2.17.0";
src = fetchFromGitHub {
owner = "denisidoro";
repo = "navi";
rev = "v${version}";
sha256 = "sha256-ngSZFYGE+Varul/qwavMO3xcMIp8w2WETWXc573wYhQ=";
sha256 = "sha256-WH8FfQ7cD4aFUi9iE0tR/B+5oWy8tMVmMLxusDwXF7w=";
};
cargoSha256 = "sha256-qtxFTk0iCxPa4Z7H9+QWSii+iYrLUV2LfiAEbePdhOQ=";
cargoSha256 = "sha256-TH9DNCoUVqH5g05Z4Vdv7F8CCLnaYezupI5FeJhYTaQ=";
nativeBuildInputs = [ makeWrapper ];
@ -23,6 +23,11 @@ rustPlatform.buildRustPackage rec {
--prefix PATH : ${lib.makeBinPath [ fzf wget ]}
'';
checkFlags = [
# error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
"--skip=test_parse_variable_line"
];
meta = with lib; {
description = "An interactive cheatsheet tool for the command-line and application launchers";
homepage = "https://github.com/denisidoro/navi";

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -60,7 +60,7 @@ let
in
mkDerivation rec {
pname = "telegram-desktop";
version = "3.1.0";
version = "3.1.1";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -69,7 +69,7 @@ mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0507qdkz8gn0gyyhxsy4mc4rs2r94s1ipqfxrc6ghgj43jkrklx3";
sha256 = "0h4g8lw9hf9pwmdljavflyn9g9jvjvany7y4vji0qcc1kd99vsnp";
};
postPatch = ''

4
pkgs/development/compilers/llvm/13/default.nix
View file

@ -19,7 +19,7 @@
let
release_version = "13.0.0";
candidate = "rc3"; # empty or "rcN"
candidate = "rc4"; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
rev-version = ""; # When using a Git commit
@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "1c781jdq0zmhhgdci201yvgl6hlpjqqmmrd6sm91azm3i99n8gw2";
sha256 = "0cjl0vssi4y2g4nfr710fb6cdhxmn5r0vis15sf088zsc5zydfhw";
};
llvm_meta = {

3
pkgs/development/libraries/udunits/default.nix
View file

@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.asl20;
maintainers = with maintainers; [ AndersonTorres pSub ];
platforms = platforms.linux;
platforms = platforms.all;
mainProgram = "udunits2";
};
}

18
pkgs/development/node-packages/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch }:
{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }:
let
since = (version: pkgs.lib.versionAtLeast nodejs.version version);
@ -280,6 +280,22 @@ let
prisma = super.prisma.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz";
sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ==";
};
dependencies = [
{
name = "_at_prisma_slash_engines";
packageName = "@prisma/engines";
version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f";
src = fetchurl {
url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz";
sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw==";
};
}
];
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \
--set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \

4
pkgs/development/node-packages/node-packages.nix generated
View file

@ -5203,7 +5203,7 @@ let
version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f";
src = fetchurl {
url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz";
sha512 = "6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw==";
sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw==";
};
};
"@protobufjs/aspromise-1.1.2" = {
@ -109733,7 +109733,7 @@ in
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz";
sha512 = "+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ==";
sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ==";
};
dependencies = [
sources."@prisma/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f"

4
pkgs/development/ocaml-modules/labltk/default.nix
View file

@ -38,6 +38,10 @@ let
version = "8.06.10";
sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a";
};
"4.13" = mkNewParam {
version = "8.06.11";
sha256 = "1zjpg9jvs6i9jvbgn6zgispwqiv8rxvaszxcx9ha9fax3wzhv9qy";
};
};
param = params . ${lib.versions.majorMinor ocaml.version}
or (throw "labltk is not available for OCaml ${ocaml.version}");

4
pkgs/development/python-modules/filetype/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "filetype";
version = "1.0.7";
version = "1.0.8";
src = fetchPypi {
inherit pname version;
sha256 = "19vav4w8vvcnrps1mirjkrv4pr1khwn5ma6m5pgpxd4qip73wffs";
sha256 = "77df14879b73fd9711b8bd4f465dadf2ecdafff0eac3b22c0bdb0ccba68db316";
};
checkPhase = ''

23
pkgs/development/python-modules/python-osc/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "python-osc";
version = "1.7.7";
src = fetchPypi {
inherit pname version;
sha256 = "4c7d68a7719d9425ab2a4ee9a2b9d5a9f5b66593fb46e20e38f91e1452bea2d2";
};
pythonImportsCheck = [ "pythonosc" ];
meta = with lib; {
description = "Open Sound Control server and client in pure python";
homepage = "https://github.com/attwad/python-osc";
license = licenses.unlicense;
maintainers = with maintainers; [ anirrudh ];
};
}

1
pkgs/development/r-modules/default.nix
View file

@ -583,6 +583,7 @@ let
"RandomFields"
"rareNMtests"
"rAverage"
"RclusTool"
"Rcmdr"
"RcmdrPlugin_coin"
"RcmdrPlugin_depthTools"

38
pkgs/development/tools/comby/default.nix
View file

@ -1,10 +1,20 @@
{ ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev
, autoconf, sqlite, stdenv }:
{ ocamlPackages
, fetchFromGitHub
, lib
, zlib
, pkg-config
, cacert
, gmp
, libev
, autoconf
, sqlite
, stdenv
}:
let
mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }:
mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ], preBuild ? "" }:
ocamlPackages.buildDunePackage rec {
inherit pname;
version = "1.5.1";
inherit pname preBuild;
version = "1.7.0";
useDune2 = true;
minimumOcamlVersion = "4.08.1";
doCheck = true;
@ -13,7 +23,7 @@ let
owner = "comby-tools";
repo = "comby";
rev = version;
sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf";
sha256 = "sha256-Y2RcYvJOSqppmxxG8IZ5GlFkXCOIQU+1jJZ6j+PBHC4";
};
nativeBuildInputs = [
@ -41,9 +51,21 @@ let
};
combyKernel = mkCombyPackage { pname = "comby-kernel"; };
in mkCombyPackage {
combySemantic = mkCombyPackage { pname = "comby-semantic"; extraBuildInputs = [ ocamlPackages.cohttp-lwt-unix ]; };
in
mkCombyPackage {
pname = "comby";
# tests have to be removed before building otherwise installPhase will fail
# cli tests expect a path to the built binary
preBuild = ''
substituteInPlace test/common/dune \
--replace "test_cli_list" "" \
--replace "test_cli_helper" "" \
--replace "test_cli" ""
rm test/common/{test_cli_list,test_cli_helper,test_cli}.ml
'';
extraBuildInputs = [
zlib
gmp
@ -62,6 +84,7 @@ in mkCombyPackage {
ocamlPackages.lwt_react
ocamlPackages.tls
combyKernel
combySemantic
] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then
[ ocamlPackages.hack_parallel ]
else
@ -74,4 +97,5 @@ in mkCombyPackage {
ocamlPackages.ppx_expect
ocamlPackages.dune-configurator
];
}

14
pkgs/development/tools/database/prisma-engines/default.nix
View file

@ -11,25 +11,19 @@ let
node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so");
in rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
version = "2.30.2";
version = "3.1.1";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
sha256 = "sha256-39+pEjve7evxcjcBK1JLTRNNjfUMoCgSgtYcdJ3zIKE=";
sha256 = "sha256-7c9jlqMKocA3Kp39zDu2in9nRw4hZRZO1+u/eFfzWa4=";
};
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=";
cargoSha256 = "sha256-W3VaxG9taRv62RW6hQkfdGJo72uHK2X6JIESJEu3PXg=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf ];
@ -45,6 +39,8 @@ in rustPlatform.buildRustPackage rec {
export SQLITE_MAX_EXPR_DEPTH=10000
'';
cargoBuildFlags = "-p query-engine -p query-engine-node-api -p migration-engine-cli -p introspection-core -p prisma-fmt";
postInstall = ''
mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node
'';

459
pkgs/development/tools/database/prisma-engines/no_tests.patch
View file

@ -1,459 +0,0 @@
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",

6
pkgs/development/tools/go-migrate/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "go-migrate";
version = "4.14.1";
version = "4.15.0";
src = fetchFromGitHub {
owner = "golang-migrate";
repo = "migrate";
rev = "v${version}";
sha256 = "1mgs3bngghmirmn0pw351m54darv8d5iymlxcjqw3vr0cyn5aqj0";
sha256 = "sha256-fl6gPKZlc8K6yD8xHC6XbmCHUJl6nI+X2I4JmXABWdY=";
};
vendorSha256 = "071gfyx6iqla8ir7ianw1z62rdsds9shakzqs9wn34ll1kdbd4rv";
vendorSha256 = "sha256-/N1sglGPwb77HLnVOzMYlFPSmeUvWs+wld7Fd7rjWrA=";
subPackages = [ "cmd/migrate" ];

6
pkgs/development/tools/rust/cargo-llvm-lines/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-llvm-lines";
version = "0.4.11";
version = "0.4.12";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "1p1agxsarkhw1mlqxawb2pj0fvsdyvi1rpp11p2k7fm341z1j71p";
sha256 = "sha256-D4blt8kGD0mxysedRMZo/VNfwfYdJs8T2zoNjHRi0ng=";
};
cargoSha256 = "1b5py9md3lkqjyn9jkl6bdynfri0yvqvrfj2frbps0hqbxiv30jl";
cargoSha256 = "sha256-H2APBu9oHmtRGSB+VQT9V5C36awPy8fi6A2Qf1RsIbU=";
meta = with lib; {
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";

4
pkgs/development/web/nodejs/v16.nix
View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.9.1";
sha256 = "070k8i9a65r03xdchr200qixv053mim5irfvgg4pl3h57k2hxxcp";
version = "16.10.0";
sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p";
patches = [ ./disable-darwin-v8-system-instrumentation.patch ];
}

6
pkgs/misc/cups/drivers/cnijfilter2/default.nix
View file

@ -4,11 +4,11 @@
stdenv.mkDerivation {
pname = "cnijfilter2";
version = "6.00";
version = "6.10";
src = fetchzip {
url = "https://gdlp01.c-wss.com/gds/9/0100010739/01/cnijfilter2-source-6.00-1.tar.gz";
sha256 = "1n4vq44zya0n4a7jvq3yyqy7dcvc2911cjvxmq48zqicb2xdgafr";
url = "https://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz";
sha256 = "0w121issdjxdv5i9ksa5m23if6pz1r9ql8p894f1pqn16w0kw1ix";
};
buildInputs = [

12
pkgs/misc/vscode-extensions/default.nix
View file

@ -194,6 +194,18 @@ let
};
};
asvetliakov.vscode-neovim = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-neovim";
publisher = "asvetliakov";
version = "0.0.82";
sha256 = "17f0jzg9vdbqdjnnc5i1q28ij2kckvvxi7fw9szmyy754f074jb1";
};
meta = {
license = lib.licenses.mit;
};
};
ms-python.vscode-pylance = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-pylance";

7
pkgs/servers/search/meilisearch/default.nix
View file

@ -46,4 +46,11 @@ stdenv.mkDerivation {
'';
dontCheck = true;
dontFixup = true;
meta = with lib; {
description = "Powerful, fast, and an easy to use search engine ";
homepage = https://docs.meilisearch.com/;
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}

4
pkgs/tools/misc/yt-dlp/default.nix
View file

@ -20,12 +20,12 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.9.2";
version = "2021.9.25";
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
sha256 = "sha256-yn53zbBVuiaD31sIB6qxweEgy+AsjzXZ0yk9lNva6mM=";
sha256 = "e7b8dd0ee9498abbd80eb38d9753696d6ca3d02f64980322ab3bf39ba1bc31ee";
};
propagatedBuildInputs = [ websockets mutagen ]

3
pkgs/tools/networking/wifite2/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, fetchpatch, python3, wirelesstools
, aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools
, hcxdumptool, pyrit, which, bully }:
, hcxdumptool, pyrit, which, bully, pixiewps }:
python3.pkgs.buildPythonApplication rec {
version = "2.5.7";
@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec {
pyrit
which
bully
pixiewps
];
postFixup = let

6
pkgs/tools/package-management/nix/default.nix
View file

@ -234,13 +234,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix";
version = "2.4${suffix}";
suffix = "pre20210908_${lib.substring 0 7 src.rev}";
suffix = "pre20210922_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "3c56f62093601143838af923195f630d8ffae2d4";
sha256 = "sha256-pjdzLOEt8i1NQe4drLpp8+LrRd2MgsISSQEsMebz2kc=";
rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4";
sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA=";
};
boehmgc = boehmgc_nixUnstable;

6
pkgs/top-level/perl-packages.nix
View file

@ -3709,10 +3709,10 @@ let
ConvertASN1 = buildPerlPackage {
pname = "Convert-ASN1";
version = "0.27";
version = "0.33";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz";
sha256 = "12nmsca6hzgxq57sx7dp8yq6zxqhl41z5a6018877sf5w25ag93l";
url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.33.tar.gz";
sha256 = "0xk0s2rnwjb7ydhwfinpjcbw25im54b8cs7r9hj3m7n7412h1pqz";
};
};

2
pkgs/top-level/python-packages.nix
View file

@ -7373,6 +7373,8 @@ in {
python_openzwave = callPackage ../development/python-modules/python_openzwave { };
python-osc = callPackage ../development/python-modules/python-osc { };
python-packer = callPackage ../development/python-modules/python-packer { };
python-pam = callPackage ../development/python-modules/python-pam {