Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
Martin Weinelt
commit
8f5da907b0
|
|
@ -159,6 +159,11 @@ The following methods are available on machine objects:
|
|||
`execute`
|
||||
|
||||
: Execute a shell command, returning a list `(status, stdout)`.
|
||||
Takes an optional parameter `check_return` that defaults to `True`.
|
||||
Setting this parameter to `False` will not check for the return code
|
||||
and return -1 instead. This can be used for commands that shut down
|
||||
the VM and would therefore break the pipe that would be used for
|
||||
retrieving the return code.
|
||||
|
||||
`succeed`
|
||||
|
||||
|
|
|
|||
|
|
@ -266,7 +266,13 @@ start_all()
|
|||
<listitem>
|
||||
<para>
|
||||
Execute a shell command, returning a list
|
||||
<literal>(status, stdout)</literal>.
|
||||
<literal>(status, stdout)</literal>. Takes an optional
|
||||
parameter <literal>check_return</literal> that defaults to
|
||||
<literal>True</literal>. Setting this parameter to
|
||||
<literal>False</literal> will not check for the return code
|
||||
and return -1 instead. This can be used for commands that shut
|
||||
down the VM and would therefore break the pipe that would be
|
||||
used for retrieving the return code.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
|
|
|||
|
|
@ -581,24 +581,40 @@ class Machine:
|
|||
+ "'{}' but it is in state ‘{}’".format(require_state, state)
|
||||
)
|
||||
|
||||
def execute(self, command: str) -> Tuple[int, str]:
|
||||
def _next_newline_closed_block_from_shell(self) -> str:
|
||||
assert self.shell
|
||||
output_buffer = []
|
||||
while True:
|
||||
# This receives up to 4096 bytes from the socket
|
||||
chunk = self.shell.recv(4096)
|
||||
if not chunk:
|
||||
# Probably a broken pipe, return the output we have
|
||||
break
|
||||
|
||||
decoded = chunk.decode()
|
||||
output_buffer += [decoded]
|
||||
if decoded[-1] == "\n":
|
||||
break
|
||||
return "".join(output_buffer)
|
||||
|
||||
def execute(self, command: str, check_return: bool = True) -> Tuple[int, str]:
|
||||
self.connect()
|
||||
|
||||
out_command = "( set -euo pipefail; {} ); echo '|!=EOF' $?\n".format(command)
|
||||
out_command = f"( set -euo pipefail; {command} ) | (base64 --wrap 0; echo)\n"
|
||||
assert self.shell
|
||||
self.shell.send(out_command.encode())
|
||||
|
||||
output = ""
|
||||
status_code_pattern = re.compile(r"(.*)\|\!=EOF\s+(\d+)")
|
||||
# Get the output
|
||||
output = base64.b64decode(self._next_newline_closed_block_from_shell())
|
||||
|
||||
while True:
|
||||
chunk = self.shell.recv(4096).decode(errors="ignore")
|
||||
match = status_code_pattern.match(chunk)
|
||||
if match:
|
||||
output += match[1]
|
||||
status_code = int(match[2])
|
||||
return (status_code, output)
|
||||
output += chunk
|
||||
if not check_return:
|
||||
return (-1, output.decode())
|
||||
|
||||
# Get the return code
|
||||
self.shell.send("echo ${PIPESTATUS[0]}\n".encode())
|
||||
rc = int(self._next_newline_closed_block_from_shell().strip())
|
||||
|
||||
return (rc, output.decode())
|
||||
|
||||
def shell_interact(self) -> None:
|
||||
"""Allows you to interact with the guest shell
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ in makeTest {
|
|||
"mkswap /dev/vda1 -L swap",
|
||||
# Install onto /mnt
|
||||
"nix-store --load-db < ${pkgs.closureInfo {rootPaths = [installedSystem];}}/registration",
|
||||
"nixos-install --root /mnt --system ${installedSystem} --no-root-passwd",
|
||||
"nixos-install --root /mnt --system ${installedSystem} --no-root-passwd --no-channel-copy >&2",
|
||||
)
|
||||
machine.shutdown()
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ in makeTest {
|
|||
)
|
||||
|
||||
# Hibernate machine
|
||||
hibernate.succeed("systemctl hibernate &")
|
||||
hibernate.execute("systemctl hibernate &", check_return=False)
|
||||
hibernate.wait_for_shutdown()
|
||||
|
||||
# Restore machine from hibernation, validate our ramfs file is there.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
|
|||
''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.succeed('kexec --load /run/current-system/kernel --initrd /run/current-system/initrd --command-line "$(</proc/cmdline)"')
|
||||
machine.succeed("systemctl kexec &")
|
||||
machine.execute("systemctl kexec &", check_return=False)
|
||||
machine.connected = False
|
||||
machine.connect()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
|
|
|||
|
|
@ -392,7 +392,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
machine.succeed("touch /testpath")
|
||||
machine.wait_until_succeeds("test -f /testpath-modified")
|
||||
|
||||
machine.succeed("rm /testpath /testpath-modified")
|
||||
machine.succeed("rm /testpath")
|
||||
machine.succeed("rm /testpath-modified")
|
||||
switch_to_specialisation("with-path-modified")
|
||||
|
||||
machine.succeed("touch /testpath")
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "MIDIVisualizer";
|
||||
version = "6.4";
|
||||
version = "6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosua20";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XR5xmQYVbBR6QWt/+PLeGqg0t4xl35MPrQNaPsmgAYA=";
|
||||
sha256 = "sha256-thRcRJ88bz3jwu6rKaQxt2MkBSf5Ri1jygkKDguP2eE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "scli";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isamert";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0fx9ig08whl7bsii9m1h9wp361ngf1szd8v8yqglgl0x8044fwrk";
|
||||
sha256 = "1lykxkqscvpzb7bvl8kfaf23mjhr2kaaqdg0756xx4z1m0smpkgy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@
|
|||
, libXi
|
||||
, libXinerama
|
||||
, libXrender
|
||||
, libXrandr
|
||||
, libXt
|
||||
, libXtst
|
||||
, libcanberra
|
||||
, libnotify
|
||||
, adwaita-icon-theme
|
||||
|
|
@ -123,7 +125,9 @@ stdenv.mkDerivation {
|
|||
libXi
|
||||
libXinerama
|
||||
libXrender
|
||||
libXrandr
|
||||
libXt
|
||||
libXtst
|
||||
libcanberra
|
||||
libnotify
|
||||
libGLU libGL
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudflared";
|
||||
version = "2021.9.2";
|
||||
version = "2021.10.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "cloudflared";
|
||||
rev = version;
|
||||
sha256 = "sha256-UAx3DY8d3I1g7DuNmBu4w+3NGUQqDdcScXdtq/VkpJ8=";
|
||||
sha256 = "sha256-vz7S6Qzr10Idy83ogMIHEHrjxGxxjtFnzNsuhbZqUnA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.20.0";
|
||||
sha256 = "06n4d7l00lmrrs7s41mjfk06c0cj04v0s0mbs9b3ppzbws07wca5";
|
||||
manifestsSha256 = "03hfnqc19n3iz47a5137lmwq4mgd6dxcl6ml057kq1bxm2qsq3y4";
|
||||
version = "0.20.1";
|
||||
sha256 = "1cbppkfw5jb0w36jjg32a4kffq616zdmib4kdhny4wwgskq4b2ng";
|
||||
manifestsSha256 = "0hwza39a31fjk37lgd0bdk8ja46sradyvkrnq2ad587zr8a8ddvb";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-WkPdBipgEOBy0qjPaX7zGfspWfCtiFB1MUMHLlHGB/U=";
|
||||
vendorSha256 = "sha256-pY+fTOZocHygT8GdRQGOujr+Pik2f21H8cqIFBKvzYQ=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "17a8bcgg9z3b4y38k035hm2lgvhmf8srlz59c7n2q3fdw2i95i68";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ jdk ib-tws ];
|
||||
|
||||
|
|
|
|||
|
|
@ -119,5 +119,7 @@ appimageTools.wrapType2 {
|
|||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ kamadorueda ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
# gpgme for i686-linux failed to build.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "antiprism";
|
||||
version = "0.26";
|
||||
version = "0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antiprism";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5FE6IbYKk7eMT985R9NCX3GDXE8SrdVHFcCpKeJvKtQ=";
|
||||
sha256 = "sha256-MHzetkmRDLBXq3KrfXmUhxURY60/Y8z5zQsExT6N4cY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cytoscape";
|
||||
version = "3.8.2";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
|
||||
sha256 = "0zgsq9qnyvmq96pgf7372r16rm034fd0r4qa72xi9zbd4f2r7z8w";
|
||||
sha256 = "sha256-7YDmojzQujHrsDuB7WC0C3Z2srTd9QUveh1baod3KvU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
i3.overrideAttrs (oldAttrs : rec {
|
||||
pname = "i3-gaps";
|
||||
version = "4.19.1";
|
||||
version = "4.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Airblader";
|
||||
repo = "i3";
|
||||
rev = version;
|
||||
sha256 = "sha256-Ydks0hioGAnVBGKraoy3a7Abq9/vHmSne+VFbrYXCug=";
|
||||
sha256 = "sha256-D16wMwCabEOG0AfAhohwcCHeUSvVF93i3zT/yu0FCu8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dictu";
|
||||
version = "0.20.0";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dictu-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GiiNIySrfpjYf5faNNml7ZRXT5pDU0SVvNvMyBh1K8E=";
|
||||
sha256 = "sha256-bAoSFHX8sQgmV3hAXsR9qT4BnUsyneeynRAByEfzjE4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ let
|
|||
};
|
||||
|
||||
"2.13" = {
|
||||
version = "2.13.6";
|
||||
sha256 = "Sd+SUDzRHMPGSWg9s2jlh4t+eS5AFW0jd+UjJuk17UM=";
|
||||
version = "2.13.7";
|
||||
sha256 = "FO8WAIeGvHs3E1soS+YkUHcB9lE5bRb9ikijWkvOqU4=";
|
||||
pname = "scala_2_13";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hwloc";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";
|
||||
sha256 = "1j2j9wn39a8v91r23xncm1rzls6rjkgkvdvqghbdsnq8ps491kx9";
|
||||
sha256 = "0fm8ky2qx5aq4dwx3slmgyvjc93fpplxbsldhkzrdhi89vj77w71";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -89,6 +89,9 @@ let
|
|||
pkgs.lib.makeBinPath [ pkgs.nodejs ]
|
||||
}
|
||||
'';
|
||||
# See: https://github.com/NixOS/nixpkgs/issues/142196
|
||||
# [...]/@hyperspace/cli/node_modules/.bin/node-gyp-build: /usr/bin/env: bad interpreter: No such file or directory
|
||||
meta.broken = true;
|
||||
};
|
||||
|
||||
mdctl-cli = super."@medable/mdctl-cli".override {
|
||||
|
|
|
|||
4136
pkgs/development/node-packages/node-packages.nix
generated
4136
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
34
pkgs/development/ocaml-modules/gluten/default.nix
Normal file
34
pkgs/development/ocaml-modules/gluten/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ buildDunePackage
|
||||
, bigstringaf
|
||||
, faraday
|
||||
, fetchurl
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gluten";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz";
|
||||
sha256 = "1pl0mpcprz8hmaiv28p7w51qfcx7s76zdkak0vm5cazbjl38nc46";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bigstringaf
|
||||
faraday
|
||||
];
|
||||
|
||||
doCheck = false; # No tests
|
||||
|
||||
meta = {
|
||||
description = "An implementation of a platform specific runtime code for driving network libraries based on state machines, such as http/af, h2 and websocketaf";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://github.com/anmonteiro/gluten";
|
||||
maintainers = with lib.maintainers; [ anmonteiro superherointj ];
|
||||
};
|
||||
}
|
||||
17
pkgs/development/ocaml-modules/gluten/lwt-unix.nix
Normal file
17
pkgs/development/ocaml-modules/gluten/lwt-unix.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ buildDunePackage
|
||||
, faraday-lwt-unix
|
||||
, gluten
|
||||
, gluten-lwt
|
||||
, lwt_ssl
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gluten-lwt-unix";
|
||||
inherit (gluten) doCheck meta src useDune2 version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
faraday-lwt-unix
|
||||
gluten-lwt
|
||||
lwt_ssl
|
||||
];
|
||||
}
|
||||
14
pkgs/development/ocaml-modules/gluten/lwt.nix
Normal file
14
pkgs/development/ocaml-modules/gluten/lwt.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ buildDunePackage
|
||||
, gluten
|
||||
, lwt
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "gluten-lwt";
|
||||
inherit (gluten) doCheck meta src useDune2 version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gluten
|
||||
lwt
|
||||
];
|
||||
}
|
||||
54
pkgs/development/ocaml-modules/piaf/default.nix
Normal file
54
pkgs/development/ocaml-modules/piaf/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ alcotest-lwt
|
||||
, buildDunePackage
|
||||
, dune-site
|
||||
, fetchzip
|
||||
, gluten-lwt-unix
|
||||
, lib
|
||||
, logs
|
||||
, lwt_ssl
|
||||
, magic-mime
|
||||
, mrmime
|
||||
, openssl
|
||||
, pecu
|
||||
, psq
|
||||
, ssl
|
||||
, uri
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "piaf";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz";
|
||||
sha256 = "0d431kz3bkwlgdamvsv94mzd9631ppcjpv516ii91glzlfdzh5hz";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym"
|
||||
'';
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
logs
|
||||
magic-mime
|
||||
mrmime
|
||||
psq
|
||||
uri
|
||||
gluten-lwt-unix
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest-lwt
|
||||
dune-site
|
||||
];
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "An HTTP library with HTTP/2 support written entirely in OCaml";
|
||||
homepage = "https://github.com/anmonteiro/piaf";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ anmonteiro superherointj ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aenum";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "75b96aa148e1335eae6c12015563989a675fcbd0bcbd0ae7ce5786329278929b";
|
||||
sha256 = "806dd4791298e19daff2cdfe7be3ae6d931d0d03097973f802b3ea55066f62dd";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopg";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e7USw3Bx6cpLu9PKDC+eEdPTSjriuSX2Sg+9BeRa9Ko=";
|
||||
sha256 = "sha256-GHKsI6JATiwUg+YlGhWPBqtYl+GyXWNiDi/hzPDl2hE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-signalr";
|
||||
version = "0.4.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "6503ddda9d6f4b634dfeb8eb4bcd14ede5e0900585f6c83bf9010cf82215c126";
|
||||
sha256 = "43fe90b5c5eb5aa00afcaf2895f1d4417f89ddb7f76bd61204e1253a6767ef7c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "black";
|
||||
version = "21.9b0";
|
||||
version = "21.10b0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-feTPx+trcQ3jJXEtQBJWiRAdIdJSg+7X6ZmHIs8Q65E=";
|
||||
sha256 = "sha256-qZUiKQkuMl/l89rlbYH2ObI/cTHrhAeBlH5LKIYDDzM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, jdk, buildPythonPackage, fetchPypi, six, py4j }:
|
||||
{ lib, jdk8, buildPythonPackage, fetchPypi, six, py4j }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
|
|
@ -11,7 +11,7 @@ buildPythonPackage rec {
|
|||
|
||||
sourceRoot = ".";
|
||||
|
||||
propagatedBuildInputs = [ py4j six jdk ];
|
||||
propagatedBuildInputs = [ py4j six jdk8 ];
|
||||
|
||||
# requires network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -7,18 +7,28 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-filter";
|
||||
version = "2.4.0";
|
||||
version = "21.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "84e9d5bb93f237e451db814ed422a3a625751cbc9968b484ecc74964a8696b06";
|
||||
sha256 = "sha256-YyolH6jxqttLjM7/kyu1L+L4Jt19/n8+rEDlxGPWg24=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_filters"
|
||||
];
|
||||
|
||||
# Tests fail (needs the 'crispy_forms' module not packaged on nixos)
|
||||
doCheck = false;
|
||||
checkInputs = [ djangorestframework django mock ];
|
||||
|
||||
checkInputs = [
|
||||
djangorestframework
|
||||
django
|
||||
mock
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} runtests.py tests
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, django
|
||||
, django-debug-toolbar
|
||||
, graphene-django
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-graphiql-debug-toolbar";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flavors";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0fikr7xl786jqfkjdifymqpqnxy4qj8g3nlkgfm24wwq0za719dw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
django-debug-toolbar
|
||||
graphene-django
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"graphiql_debug_toolbar"
|
||||
];
|
||||
|
||||
DB_BACKEND = "sqlite";
|
||||
DB_NAME = ":memory:";
|
||||
DJANGO_SETTINGS_MODULE = "tests.settings";
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} -m django test tests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Django Debug Toolbar for GraphiQL IDE";
|
||||
homepage = "https://github.com/flavors/django-graphiql-debug-toolbar";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/django-js-asset/default.nix
Normal file
40
pkgs/development/python-modules/django-js-asset/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-js-asset";
|
||||
version = "unstable-2021-06-07";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthiask";
|
||||
repo = pname;
|
||||
rev = "a186aa0b5721ca95da6cc032a2fb780a152f581b";
|
||||
sha256 = "141zxng0wwxalsi905cs8pdppy3ad717y3g4fkdxw4n3pd0fjp8r";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"js_asset"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} tests/manage.py test testapp
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Script tag with additional attributes for django.forms.Media";
|
||||
homepage = "https://github.com/matthiask/django-js-asset";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
license = with licenses; [ bsd3 ];
|
||||
};
|
||||
}
|
||||
42
pkgs/development/python-modules/django-mptt/default.nix
Normal file
42
pkgs/development/python-modules/django-mptt/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
, django-js-asset
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-mptt";
|
||||
version = "0.13.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "12y3chxhqxk2yxin055f0f45nabj0s8hil12hw0lwzlbax6k9ss6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
django-js-asset
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mptt"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} tests/manage.py test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utilities for implementing a modified pre-order traversal tree in Django";
|
||||
homepage = "https://github.com/django-mptt/django-mptt";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, prometheus-client
|
||||
, psycopg2
|
||||
, pytest-django
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-prometheus";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "korfuri";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1y1cmycc545xrys41jk8kia36hwnkwhkw26mlpfdjgb63vq30x1d";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./drop-untestable-database-backends.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
prometheus-client
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_prometheus"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-django
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Django middlewares to monitor your application with Prometheus.io";
|
||||
homepage = "https://github.com/korfuri/django-prometheus";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
diff --git a/django_prometheus/tests/end2end/testapp/settings.py b/django_prometheus/tests/end2end/testapp/settings.py
|
||||
index 0630721..bd2190a 100644
|
||||
--- a/django_prometheus/tests/end2end/testapp/settings.py
|
||||
+++ b/django_prometheus/tests/end2end/testapp/settings.py
|
||||
@@ -53,33 +53,6 @@ DATABASES = {
|
||||
"ENGINE": "django_prometheus.db.backends.sqlite3",
|
||||
"NAME": "db.sqlite3",
|
||||
},
|
||||
- # Comment this to not test django_prometheus.db.backends.postgres.
|
||||
- "postgresql": {
|
||||
- "ENGINE": "django_prometheus.db.backends.postgresql",
|
||||
- "NAME": "postgres",
|
||||
- "USER": "postgres",
|
||||
- "PASSWORD": "",
|
||||
- "HOST": "localhost",
|
||||
- "PORT": "5432",
|
||||
- },
|
||||
- # Comment this to not test django_prometheus.db.backends.postgis.
|
||||
- "postgis": {
|
||||
- "ENGINE": "django_prometheus.db.backends.postgis",
|
||||
- "NAME": "postgis",
|
||||
- "USER": "postgres",
|
||||
- "PASSWORD": "",
|
||||
- "HOST": "localhost",
|
||||
- "PORT": "5432",
|
||||
- },
|
||||
- # Comment this to not test django_prometheus.db.backends.mysql.
|
||||
- "mysql": {
|
||||
- "ENGINE": "django_prometheus.db.backends.mysql",
|
||||
- "NAME": "django_prometheus_1",
|
||||
- "USER": "travis",
|
||||
- "PASSWORD": "",
|
||||
- "HOST": "localhost",
|
||||
- "PORT": "3306",
|
||||
- },
|
||||
# The following databases are used by test_db.py only
|
||||
"test_db_1": {
|
||||
"ENGINE": "django_prometheus.db.backends.sqlite3",
|
||||
50
pkgs/development/python-modules/django-redis/default.nix
Normal file
50
pkgs/development/python-modules/django-redis/default.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, buildPythonPackage
|
||||
, django
|
||||
, redis
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-redis";
|
||||
version = "5.0.0";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "django-redis";
|
||||
rev = version;
|
||||
sha256 = "1np10hfyg4aamlz7vav9fy80gynb1lhl2drqkbckr3gg1gbz6crj";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/-cov/d' setup.cfg
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
redis
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_redis"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_backend.py" # django.core.exceptions.ImproperlyConfigured: Requested setting DJANGO_REDIS_SCAN_ITERSIZE, but settings are not configured.
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Full featured redis cache backend for Django";
|
||||
homepage = "https://github.com/jazzband/django-redis";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
43
pkgs/development/python-modules/django-rq/default.nix
Normal file
43
pkgs/development/python-modules/django-rq/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
, redis
|
||||
, rq
|
||||
, sentry-sdk
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-rq";
|
||||
version = "2.4.1";
|
||||
format = "setuptools";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rq";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1dy3mhj60xlqy7f65zh80sqn6qywsp697r6yy3jcl5wmwizzhybr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
redis
|
||||
rq
|
||||
sentry-sdk
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_rq"
|
||||
];
|
||||
|
||||
doCheck = false; # require redis-server
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple app that provides django integration for RQ (Redis Queue)";
|
||||
homepage = "https://github.com/rq/django-rq";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
46
pkgs/development/python-modules/django-tables2/default.nix
Normal file
46
pkgs/development/python-modules/django-tables2/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
, tablib
|
||||
, django-filter
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-tables2";
|
||||
version = "2.4.1";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jieter";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "04vvgf18diwp0mgp14b71a0dxhgrcslv1ljybi300gvzvzjnp3qv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
tablib
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
# Requested setting DJANGO_TABLES2_TEMPLATE, but settings are not configured.
|
||||
];
|
||||
|
||||
doCheck = false; # needs django-boostrap{3,4} packages
|
||||
|
||||
# Leave this in! Discovering how to run tests is annoying in Django apps
|
||||
checkPhase = ''
|
||||
${python.interpreter} example/manage.py test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Django app for creating HTML tables";
|
||||
homepage = "https://github.com/jieter/django-tables2";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,28 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, django
|
||||
, djangorestframework
|
||||
, mock
|
||||
, isort
|
||||
, isPy3k
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-taggit";
|
||||
version = "1.5.1";
|
||||
disabled = !isPy3k;
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ isort django djangorestframework ];
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"taggit"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
djangorestframework
|
||||
];
|
||||
|
||||
checkInputs = [ mock ];
|
||||
checkPhase = ''
|
||||
# prove we're running tests against installed package, not build dir
|
||||
rm -r taggit
|
||||
|
|
@ -33,9 +42,9 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "django-taggit is a reusable Django application for simple tagging";
|
||||
homepage = "https://github.com/alex/django-taggit/tree/master/";
|
||||
license = licenses.bsd2;
|
||||
description = "Simple tagging for django";
|
||||
homepage = "https://github.com/jazzband/django-taggit";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ desiderius ];
|
||||
};
|
||||
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, django
|
||||
, djangorestframework
|
||||
, pytz
|
||||
, pytest
|
||||
, pytest-lazy-fixture
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-timezone-field";
|
||||
version = "4.2.1";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfogel";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0swld4168pfhppr9q3i9r062l832cmmx792kkvlcvxfbdhk6qz9h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
djangorestframework
|
||||
pytz
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"timezone_field"
|
||||
];
|
||||
|
||||
# Uses pytest.lazy_fixture directly which is broken in pytest-lazy-fixture
|
||||
# https://github.com/TvoroG/pytest-lazy-fixture/issues/22
|
||||
doCheck = false;
|
||||
|
||||
DJANGO_SETTINGS_MODULE = "tests.settings";
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
pytest-lazy-fixture
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m django test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Django app providing database, form and serializer fields for pytz timezone objects";
|
||||
homepage = "https://github.com/mfogel/django-timezone-field";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, mock
|
||||
, django
|
||||
, redis
|
||||
, msgpack
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "django-redis";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "048f665bbe27f8ff2edebae6aa9c534ab137f1e8fa7234147ef470df3f3aa9b8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
redis
|
||||
msgpack
|
||||
];
|
||||
|
||||
# django.core.exceptions.ImproperlyConfigured: Requested setting DJANGO_REDIS_SCAN_ITERSIZE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "django_redis" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Full featured redis cache backend for Django";
|
||||
homepage = "https://github.com/niwibe/django-redis";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "11.21.0";
|
||||
version = "11.22.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6a4697acfe95bea13af9c133a41a8d774946c58ab47083b4c82a017a1b08c380";
|
||||
sha256 = "ab84c9c78606faa0dc94cdb95c6b2bdb579beb5f34fff42091c98a1e0fbeb16c";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "env-canada";
|
||||
version = "0.5.14";
|
||||
version = "0.5.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaeldavie";
|
||||
repo = "env_canada";
|
||||
rev = "v${version}";
|
||||
sha256 = "06v9ifpgdfx5v8k8jwqd4y985p27s1wxl7908v3aqxv7203acn7w";
|
||||
sha256 = "1mgh4sbibgwzrgnlfz4ia2djlyniq7b6f9bd9f2yd1wkai32dm2a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastecdsa";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "48d59fcd18d0892a6b76463d4c98caa217975414f6d853af7cfcbbb0284cb52d";
|
||||
sha256 = "1eb6f3ac86ec483a10df62fcda1fb9a9d5d895a436871a8aa935dd20ccd82c6f";
|
||||
};
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-logging";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a85d11c28733792ee55218fce7786f51fdd013c79ff1d92531ffd50a8a51692c";
|
||||
sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -41,7 +41,10 @@ buildPythonPackage rec {
|
|||
|
||||
disabledTestPaths = [
|
||||
# Requires credentials
|
||||
"tests/system/test_system.py"
|
||||
"tests/system/test_allocate_reserve_ids.py"
|
||||
"tests/system/test_query.py"
|
||||
"tests/system/test_put.py"
|
||||
"tests/system/test_transaction.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-error-reporting";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a5482a7b05ac3be13a3d96db32d158cb4cebf0ac35c82c3a27ee2fd9aa0dcc25";
|
||||
sha256 = "sha256-gLp+KmXN0/W5LUvTy0nop6jQThva9UK87kkaRGTI0WY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -24,6 +24,11 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "google-cloud-appengine-logging >= 0.1.0, < 1.0.0dev" "google-cloud-appengine-logging >= 0.1.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-cloud-appengine-logging
|
||||
|
|
|
|||
65
pkgs/development/python-modules/graphene-django/default.nix
Normal file
65
pkgs/development/python-modules/graphene-django/default.nix
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
|
||||
, graphene
|
||||
, graphql-core
|
||||
, django
|
||||
, djangorestframework
|
||||
, promise
|
||||
, text-unidecode
|
||||
|
||||
, django-filter
|
||||
, mock
|
||||
, pytest-django
|
||||
, pytest-random-order
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene-django";
|
||||
version = "unstable-2021-06-11";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graphql-python";
|
||||
repo = pname;
|
||||
rev = "e7f7d8da07ba1020f9916153f17e97b0ec037712";
|
||||
sha256 = "0b33q1im90ahp3gzy9wx5amfzy6q57ydjpy5rn988gh81hbyqaxv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
djangorestframework
|
||||
graphene
|
||||
graphql-core
|
||||
django
|
||||
promise
|
||||
text-unidecode
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export DJANGO_SETTINGS_MODULE=examples.django_test_settings
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
django-filter
|
||||
mock
|
||||
pytest-django
|
||||
pytest-random-order
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Integrate GraphQL into your Django project";
|
||||
homepage = "https://github.com/graphql-python/graphene-django";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
33
pkgs/development/python-modules/markdown-include/default.nix
Normal file
33
pkgs/development/python-modules/markdown-include/default.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, markdown
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "markdown-include";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18p4qfhazvskcg6xsdv1np8m1gc1llyabp311xzhqy7p6q76hpbg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
markdown
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"markdown_include"
|
||||
];
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extension to Python-Markdown which provides an include function";
|
||||
homepage = "https://github.com/cmacmackin/markdown-include";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.19.7";
|
||||
version = "1.19.8";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1e5e8a19b8ebc3118d32ce1e13ad3cc5f90d34b613779b66dfdec0658cf7036f";
|
||||
sha256 = "60481cae38e01273d09a6159e4ff8c36d5d7e335319117a16cdb3d887928a7b4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "21.10.2";
|
||||
version = "21.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RSv0s8Qk5E1CJsmeT7ESIMQ4llsFER8N0AOyEjGpdsQ=";
|
||||
sha256 = "sha256-uP4M1ShhKsvqnUixc3JUJVpNQOwYn8Gm2uWVcXhFKLg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "preshed";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c6d3dba39ed5059aaf99767017b9568c75b2d0780c3481e204b1daecde00360e";
|
||||
sha256 = "fb3b7588a3a0f2f2f1bf3fe403361b2b031212b73a37025aea1df7215af3772a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyinsteon";
|
||||
version = "1.0.12";
|
||||
version = "1.0.13";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IlRCUogs78kbKY8gp22YzIkNrXhSCLJDDDtFAucrQxE=";
|
||||
sha256 = "sha256-KVwAF+yoU26ktNRKWQ+nrhS1i90xQxAhRAr4VJ+xtl0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, pytestCheckHook
|
||||
, process-tests
|
||||
, pkgs
|
||||
, withDjango ? false, django_redis
|
||||
, withDjango ? false, django-redis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
redis
|
||||
] ++ lib.optional withDjango django_redis;
|
||||
] ++ lib.optional withDjango django-redis;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytools";
|
||||
version = "2021.2.8";
|
||||
version = "2021.2.9";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b";
|
||||
sha256 = "db6cf83c9ba0a165d545029e2301621486d1e9ef295684072e5cd75316a13755";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyturbojpeg";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTurboJPEG";
|
||||
inherit version;
|
||||
sha256 = "sha256-RiWkDoBETMYigAdbxdj5xb5ht9mQ5qzifE1omqTVZlo=";
|
||||
sha256 = "sha256-gOf/i2OyNtB3oIATXzijRUnhEaMlHRvwWXPguqHDG1A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "svgwrite";
|
||||
version = "1.4";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozman";
|
||||
repo = "svgwrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "15xjz5b4dw1sg3a5k4wmzky4h5v1n937id8vl6hha1a2xj42z2s5";
|
||||
sha256 = "sha256-d//ZUFb5yj51uD1fb6yJJROaQ2MLyfA3Pa84TblqLNk=";
|
||||
};
|
||||
|
||||
# svgwrite requires Python 3.6 or newer
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.6.2";
|
||||
version = "2.7.0";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
sha256 = "096w9w52rj854i7rmpgy99k9z9ja2dfvj2d02dnpagwd7pc6a6bl";
|
||||
sha256 = "sha256-KsgtuQ0ovccZTMm19LrxRU/JOcLzfkL6VRa6W7Tprnw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt-extras";
|
||||
rev = "aff36a23f7213d94189aabfcc47a32b11f3a6fba";
|
||||
version = "2021-09-24";
|
||||
rev = "031e092829365768db7f07cb676ef3642e24c1f4";
|
||||
version = "2021-10-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulp";
|
||||
repo = "sbt-extras";
|
||||
inherit rev;
|
||||
sha256 = "CBPiA9UdTc31EbfCdG70j88sn53CfZBr8rlt6+ViivI=";
|
||||
sha256 = "5e/tvRP6oqlstESY8NH752fujFcGZ9rF/rYW9ZFg0Gk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://scalameta.org/metals/";
|
||||
license = licenses.asl20;
|
||||
description = "Work-in-progress language server for Scala";
|
||||
maintainers = with maintainers; [ ceedubs fabianhjr tomahna ];
|
||||
maintainers = with maintainers; [ fabianhjr tomahna ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-msrv";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foresterre";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7GixO9aoHx07wQHTEtbEDQ52Dr3MZ0p4Xq0Ol7E/swI=";
|
||||
sha256 = "sha256-zc6jJqG7OGqfsPnb3VeKmEnz8AL2p1wHqgDvHQC5OX8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cxbsTRANX1WA0Lf6CHcJoxSKrGHtBfjInSKhFJmTDnE=";
|
||||
cargoSha256 = "sha256-SjgYkDDe11SVN6rRZTi/fYB8CgYhu2kfSXrIyimlhkk=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-udeps";
|
||||
version = "0.1.23";
|
||||
version = "0.1.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "est31";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SDB2Xk2bEheXT0Lc1lrTkOyJAcAEsmUPU5R8Hy1SAUE=";
|
||||
sha256 = "sha256-/A3OaJje8AT4zR91sLAYN6lsKiv2FbSBYAeuc79nSF0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-gCGOXEjhT9bx3FYvtu3AoIOmgsU2WO1rmi/cKvD9WMY=";
|
||||
cargoSha256 = "sha256-1LXcuLmbW0ezLJG0sszQDZqa2cRaMMC4blNjmFg1Ltc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, CoreServices
|
||||
, cmake
|
||||
, libiconv
|
||||
, useMimalloc ? false
|
||||
, doCheck ? true
|
||||
|
|
@ -6,23 +12,46 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2021-09-20";
|
||||
cargoSha256 = "sha256-OPolZ0oXGRcKvWxXkRMjyEXzvf1p41hGfHBpbDbLJck=";
|
||||
version = "2021-10-25";
|
||||
cargoSha256 = "sha256-PCQxXNpv4krdLBhyINoZT5QxV2hCqXpp1mqs0dUu4Ag=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-analyzer";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-k2UGz+h9++8wtV+XdGZbWysjkIDe+UNudKL46eisZzw=";
|
||||
sha256 = "sha256-3AMRwtEmITIvUdR/NINQTPatkjhmS1dQsbbsefIDYAE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Code format and git history check require more dependencies but don't really matter for packaging.
|
||||
# So just ignore them.
|
||||
./ignore-git-and-rustfmt-tests.patch
|
||||
];
|
||||
|
||||
# Patch for our rust 1.54.0 in nixpkgs. Remove it when we have rust >= 1.55.0
|
||||
./no-1-55-control-flow.patch
|
||||
# Revert edition 2021 related code since we have rust 1.55.0 in nixpkgs currently.
|
||||
# Remove them when we have rust >= 1.56.0
|
||||
# They change Cargo.toml so go `cargoPatches`.
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rust-analyzer/rust-analyzer/commit/f0ad6fa68bf98d317518bb75da01b7bb7abe98d3.patch";
|
||||
revert = true;
|
||||
sha256 = "sha256-ksX2j1Pgtd+M+FmXTEljm1nUxJwcY8GDQ9784Lb1uM4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rust-analyzer/rust-analyzer/commit/8457ae34bdbca117b2ef73787b214161440e21f9.patch";
|
||||
revert = true;
|
||||
sha256 = "sha256-w1Py1bvZ2/tDQDZVMNmPRo6i6uA4H3YYZY4rXlo0iqg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rust-analyzer/rust-analyzer/commit/ca44b6892e3e66765355d4e645f74df3d184c03b.patch";
|
||||
revert = true;
|
||||
sha256 = "sha256-N1TWlLxEg6oxFkns1ieVVvLAkrHq2WOr1tbkNvZvDFg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/rust-analyzer/rust-analyzer/commit/1294bfce865c556184c9327af4a8953ca940aec8.patch";
|
||||
revert = true;
|
||||
sha256 = "sha256-65eZxAjsuUln6lzSihIP26x15PELLDL4yk9wiVzJ0hE=";
|
||||
})
|
||||
];
|
||||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
|
|
|
|||
|
|
@ -1,212 +0,0 @@
|
|||
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
|
||||
index 3b0c29e87..2841a39e2 100644
|
||||
--- a/crates/hir/src/lib.rs
|
||||
+++ b/crates/hir/src/lib.rs
|
||||
@@ -31,7 +31,7 @@ pub mod db;
|
||||
|
||||
mod display;
|
||||
|
||||
-use std::{iter, ops::ControlFlow, sync::Arc};
|
||||
+use std::{iter, sync::Arc};
|
||||
|
||||
use arrayvec::ArrayVec;
|
||||
use base_db::{CrateDisplayName, CrateId, Edition, FileId};
|
||||
@@ -70,7 +70,7 @@ use itertools::Itertools;
|
||||
use nameres::diagnostics::DefDiagnosticKind;
|
||||
use once_cell::unsync::Lazy;
|
||||
use rustc_hash::FxHashSet;
|
||||
-use stdx::{format_to, impl_from};
|
||||
+use stdx::{format_to, impl_from, ControlFlow};
|
||||
use syntax::{
|
||||
ast::{self, AttrsOwner, NameOwner},
|
||||
AstNode, AstPtr, SmolStr, SyntaxKind, SyntaxNodePtr,
|
||||
diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs
|
||||
index c88a8b653..039b5589e 100644
|
||||
--- a/crates/hir_ty/src/method_resolution.rs
|
||||
+++ b/crates/hir_ty/src/method_resolution.rs
|
||||
@@ -2,7 +2,7 @@
|
||||
//! For details about how this works in rustc, see the method lookup page in the
|
||||
//! [rustc guide](https://rust-lang.github.io/rustc-guide/method-lookup.html)
|
||||
//! and the corresponding code mostly in librustc_typeck/check/method/probe.rs.
|
||||
-use std::{iter, ops::ControlFlow, sync::Arc};
|
||||
+use std::{iter, sync::Arc};
|
||||
|
||||
use arrayvec::ArrayVec;
|
||||
use base_db::{CrateId, Edition};
|
||||
@@ -13,6 +13,7 @@ use hir_def::{
|
||||
};
|
||||
use hir_expand::name::Name;
|
||||
use rustc_hash::{FxHashMap, FxHashSet};
|
||||
+use stdx::{try_control_flow, ControlFlow};
|
||||
|
||||
use crate::{
|
||||
autoderef,
|
||||
@@ -483,7 +484,7 @@ pub fn iterate_method_candidates_dyn(
|
||||
|
||||
let deref_chain = autoderef_method_receiver(db, krate, ty);
|
||||
for i in 0..deref_chain.len() {
|
||||
- iterate_method_candidates_with_autoref(
|
||||
+ try_control_flow!(iterate_method_candidates_with_autoref(
|
||||
&deref_chain[i..],
|
||||
db,
|
||||
env.clone(),
|
||||
@@ -492,7 +493,7 @@ pub fn iterate_method_candidates_dyn(
|
||||
visible_from_module,
|
||||
name,
|
||||
callback,
|
||||
- )?;
|
||||
+ ));
|
||||
}
|
||||
ControlFlow::Continue(())
|
||||
}
|
||||
@@ -522,7 +523,7 @@ fn iterate_method_candidates_with_autoref(
|
||||
name: Option<&Name>,
|
||||
mut callback: &mut dyn FnMut(&Canonical<Ty>, AssocItemId) -> ControlFlow<()>,
|
||||
) -> ControlFlow<()> {
|
||||
- iterate_method_candidates_by_receiver(
|
||||
+ try_control_flow!(iterate_method_candidates_by_receiver(
|
||||
&deref_chain[0],
|
||||
&deref_chain[1..],
|
||||
db,
|
||||
@@ -532,7 +533,7 @@ fn iterate_method_candidates_with_autoref(
|
||||
visible_from_module,
|
||||
name,
|
||||
&mut callback,
|
||||
- )?;
|
||||
+ ));
|
||||
|
||||
let refed = Canonical {
|
||||
binders: deref_chain[0].binders.clone(),
|
||||
@@ -540,7 +541,7 @@ fn iterate_method_candidates_with_autoref(
|
||||
.intern(&Interner),
|
||||
};
|
||||
|
||||
- iterate_method_candidates_by_receiver(
|
||||
+ try_control_flow!(iterate_method_candidates_by_receiver(
|
||||
&refed,
|
||||
deref_chain,
|
||||
db,
|
||||
@@ -550,7 +551,7 @@ fn iterate_method_candidates_with_autoref(
|
||||
visible_from_module,
|
||||
name,
|
||||
&mut callback,
|
||||
- )?;
|
||||
+ ));
|
||||
|
||||
let ref_muted = Canonical {
|
||||
binders: deref_chain[0].binders.clone(),
|
||||
@@ -586,7 +587,7 @@ fn iterate_method_candidates_by_receiver(
|
||||
// be found in any of the derefs of receiver_ty, so we have to go through
|
||||
// that.
|
||||
for self_ty in std::iter::once(receiver_ty).chain(rest_of_deref_chain) {
|
||||
- iterate_inherent_methods(
|
||||
+ try_control_flow!(iterate_inherent_methods(
|
||||
self_ty,
|
||||
db,
|
||||
env.clone(),
|
||||
@@ -595,11 +596,11 @@ fn iterate_method_candidates_by_receiver(
|
||||
krate,
|
||||
visible_from_module,
|
||||
&mut callback,
|
||||
- )?
|
||||
+ ))
|
||||
}
|
||||
|
||||
for self_ty in std::iter::once(receiver_ty).chain(rest_of_deref_chain) {
|
||||
- iterate_trait_method_candidates(
|
||||
+ try_control_flow!(iterate_trait_method_candidates(
|
||||
self_ty,
|
||||
db,
|
||||
env.clone(),
|
||||
@@ -608,7 +609,7 @@ fn iterate_method_candidates_by_receiver(
|
||||
name,
|
||||
Some(receiver_ty),
|
||||
&mut callback,
|
||||
- )?
|
||||
+ ))
|
||||
}
|
||||
|
||||
ControlFlow::Continue(())
|
||||
@@ -624,7 +625,7 @@ fn iterate_method_candidates_for_self_ty(
|
||||
name: Option<&Name>,
|
||||
mut callback: &mut dyn FnMut(&Canonical<Ty>, AssocItemId) -> ControlFlow<()>,
|
||||
) -> ControlFlow<()> {
|
||||
- iterate_inherent_methods(
|
||||
+ try_control_flow!(iterate_inherent_methods(
|
||||
self_ty,
|
||||
db,
|
||||
env.clone(),
|
||||
@@ -633,7 +634,7 @@ fn iterate_method_candidates_for_self_ty(
|
||||
krate,
|
||||
visible_from_module,
|
||||
&mut callback,
|
||||
- )?;
|
||||
+ ));
|
||||
iterate_trait_method_candidates(self_ty, db, env, krate, traits_in_scope, name, None, callback)
|
||||
}
|
||||
|
||||
@@ -697,7 +698,7 @@ fn iterate_trait_method_candidates(
|
||||
}
|
||||
known_implemented = true;
|
||||
// FIXME: we shouldn't be ignoring the binders here
|
||||
- callback(self_ty, *item)?
|
||||
+ try_control_flow!(callback(self_ty, *item))
|
||||
}
|
||||
}
|
||||
ControlFlow::Continue(())
|
||||
@@ -774,7 +775,7 @@ fn iterate_inherent_methods(
|
||||
continue;
|
||||
}
|
||||
let receiver_ty = receiver_ty.unwrap_or(self_ty);
|
||||
- callback(receiver_ty, item)?;
|
||||
+ try_control_flow!(callback(receiver_ty, item));
|
||||
}
|
||||
}
|
||||
}
|
||||
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
|
||||
index 506d3ba3c..590963c17 100644
|
||||
--- a/crates/ide/src/hover.rs
|
||||
+++ b/crates/ide/src/hover.rs
|
||||
@@ -1,4 +1,4 @@
|
||||
-use std::{collections::HashSet, ops::ControlFlow};
|
||||
+use std::collections::HashSet;
|
||||
|
||||
use either::Either;
|
||||
use hir::{AsAssocItem, HasAttrs, HasSource, HirDisplay, Semantics, TypeInfo};
|
||||
@@ -12,7 +12,7 @@ use ide_db::{
|
||||
RootDatabase,
|
||||
};
|
||||
use itertools::Itertools;
|
||||
-use stdx::format_to;
|
||||
+use stdx::{format_to, ControlFlow};
|
||||
use syntax::{
|
||||
algo, ast, display::fn_as_proc_macro_label, match_ast, AstNode, Direction, SyntaxKind::*,
|
||||
SyntaxNode, SyntaxToken, TextRange, TextSize, T,
|
||||
diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs
|
||||
index e7d4753de..fddf95147 100644
|
||||
--- a/crates/stdx/src/lib.rs
|
||||
+++ b/crates/stdx/src/lib.rs
|
||||
@@ -7,6 +7,22 @@ pub mod panic_context;
|
||||
|
||||
pub use always_assert::{always, never};
|
||||
|
||||
+/// std::ops::ControlFlow from rust std 1.55.0
|
||||
+pub enum ControlFlow<B, C = ()> {
|
||||
+ Continue(C),
|
||||
+ Break(B),
|
||||
+}
|
||||
+
|
||||
+#[macro_export]
|
||||
+macro_rules! try_control_flow {
|
||||
+ ($e:expr) => {
|
||||
+ match $e {
|
||||
+ $crate::ControlFlow::Continue(c) => c,
|
||||
+ $crate::ControlFlow::Break(b) => return $crate::ControlFlow::Break(b),
|
||||
+ }
|
||||
+ };
|
||||
+}
|
||||
+
|
||||
#[inline(always)]
|
||||
pub fn is_ci() -> bool {
|
||||
option_env!("CI").is_some()
|
||||
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.1.9";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10ydsp77v4kf1qsq5wyc02iyfsdy0rpcyxycp2lqz9qy3g3ih7vm";
|
||||
sha256 = "sha256-7L+hRr+/sphH4fq4vX7lI9KR6Tks1uLveSJ/wLqO1Ek=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1i6999nmg4pahpp4fz4qm4rx8iixa13zjwlhyixwjwbag1w8l3gp";
|
||||
cargoSha256 = "sha256-AxhFQxtT3PfG3Y9nJlp8n4HjaOXxs9KDPY9Ha5Lr4VE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "grapejuice";
|
||||
version = "3.60.14";
|
||||
version = "3.64.16";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "BrinkerVII";
|
||||
repo = "grapejuice";
|
||||
rev = "8a86aa31444f6afa97e4ab4cc2c651b1243b8349";
|
||||
sha256 = "sha256-2+zG0O5ZW3rA4c83HXWsQ/V72KwHgrynDH0i3rLBWwU=";
|
||||
rev = "a5bc65e094bbfb86e6142ac1da59017ddccff69e";
|
||||
sha256 = "sha256-3+5LWn+UBgLAX683MPHRHQMpW+gC5hGIwTtRVJHRWeE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2021.1016.0";
|
||||
version = "2021.1028.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
sha256 = "PaN/+t5qnHaOjh+DfM/Ylw1vESCM3Tejd3li9ml2Z+A=";
|
||||
sha256 = "QXdhdZ0M09Fg7owEQG2BACZYeZzBgCsg7MtS7NIU2Z4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
8
pkgs/games/osu-lazer/deps.nix
generated
8
pkgs/games/osu-lazer/deps.nix
generated
|
|
@ -118,7 +118,7 @@
|
|||
(fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; sha256 = "0i7li76gmk6hml12aig4cvyvja9mgl16qr8pkwvx5vm6lc9a3nn4"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; })
|
||||
(fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; })
|
||||
|
|
@ -158,11 +158,11 @@
|
|||
(fetchNuGet { name = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; })
|
||||
(fetchNuGet { name = "ppy.LocalisationAnalyser"; version = "2021.725.0"; sha256 = "00nvk8kw94v0iq5k7y810sa235lqdjlggq7f00c64c3d1zam4203"; })
|
||||
(fetchNuGet { name = "ppy.ManagedBass"; version = "3.1.3-alpha"; sha256 = "0qdrklalp42pbyb30vpr7c0kwjablsja0s6xplxxkpfd14y8mzk4"; })
|
||||
(fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1014.0"; sha256 = "0j0b9hhglpqgla82c8yxqangjxqabsc9xb0z1jc6lb7rh854xzli"; })
|
||||
(fetchNuGet { name = "ppy.osu.Framework"; version = "2021.1026.0"; sha256 = "1x1iyii411k8d9wxv71g256ac64b3nv3qqm9zxpbj2d3b7qls0ss"; })
|
||||
(fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2021.805.0"; sha256 = "004c053s6p7339bfw68lvlyk9jkbw6djkf2d72dz8wam546k8dcl"; })
|
||||
(fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1015.0"; sha256 = "0h2sb35yajgnfhn9729p9r83m8mwv7r03gd55b07wl8vhzb2r3s5"; })
|
||||
(fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2021.1026.0"; sha256 = "1500x3cmllhw0vkxmvixzhhpmgfqqkpadcnj4y7n4694kiqcwccn"; })
|
||||
(fetchNuGet { name = "ppy.osuTK.NS20"; version = "1.0.178"; sha256 = "1bv77rrf3g6zr4bzfrrqqzl0vjj4c8izc0sakckda8dlm6h3gxln"; })
|
||||
(fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.452-alpha"; sha256 = "0l59cfji8w0x2nrp3m7xvfpw4y7z5dhwsq4wq3wf4r6npwnra0hc"; })
|
||||
(fetchNuGet { name = "ppy.SDL2-CS"; version = "1.0.468-alpha"; sha256 = "1qa2xg5p6ywmvzz868vck2jy4sn8vfqssa4an4afqsmc4amxfmc8"; })
|
||||
(fetchNuGet { name = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; })
|
||||
(fetchNuGet { name = "Realm"; version = "10.6.0"; sha256 = "0vsd99zr22a2cvyx71gdqqvr2ld239v5s4dhhfdkjgvadz5dyc2a"; })
|
||||
(fetchNuGet { name = "Realm.Fody"; version = "10.6.0"; sha256 = "031igfdwrkgn5nh19qxh6s6l8l1ni6lgk65dhqrzqc202xqidsdm"; })
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qtads";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "realnc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DxbVYFHIVFF/5ZeHIeu3k+btCvw/qfM7uoH5mb1ikoE=";
|
||||
sha256 = "sha256-xMAGbOA+qtwMk5VT5yi//GDzTKtYfGku/Sm4l5smzEs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.0.7094"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
version = "1.0.7096"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "c6015daf8ddbd8a08e0adff8d39ffc38c7b339a2";
|
||||
sha256 = "088il16rxkk74fdpqrbw1fq5f2c23921zi7v544iw8c62hqxxzv1";
|
||||
rev = "f41687f4c1948e9e111afd70e979e98ea5de52fa";
|
||||
sha256 = "0l0ll0bbqnqr63xlv4j9ir8pqb2ni7xmw52r8mdzw8vxq6xgs70b";
|
||||
};
|
||||
|
||||
projectFile = "Ryujinx.sln";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "rust-analyzer",
|
||||
"version": "0.2.751",
|
||||
"version": "0.2.792",
|
||||
"dependencies": {
|
||||
"https-proxy-agent": "^5.0.0",
|
||||
"node-fetch": "^2.6.1",
|
||||
"vscode-languageclient": "^7.1.0-next.5",
|
||||
"d3": "^7.0.0",
|
||||
"vscode-languageclient": "8.0.0-next.2",
|
||||
"d3": "^7.1.0",
|
||||
"d3-graphviz": "^4.0.0",
|
||||
"@types/glob": "^7.1.4",
|
||||
"@types/mocha": "^8.2.3",
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
"tslib": "^2.3.0",
|
||||
"typescript": "^4.3.5",
|
||||
"typescript-formatter": "^7.2.2",
|
||||
"vsce": "^1.95.1",
|
||||
"vsce": "=1.95.1",
|
||||
"vscode-test": "^1.5.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
"memory-streams": "^0.1.3",
|
||||
"vscode-debugprotocol": "^1.47.0",
|
||||
"vscode-debugadapter-testsupport": "^1.47.0",
|
||||
"vsce": "^1.88.0",
|
||||
"vsce": "=1.88.0",
|
||||
"webpack": "^5.37.1",
|
||||
"webpack-cli": "^4.7.0",
|
||||
"ts-loader": "^8.0.0"
|
||||
|
|
|
|||
|
|
@ -804,6 +804,9 @@ let
|
|||
NET_FC = yes; # Fibre Channel driver support
|
||||
# GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
|
||||
PINCTRL_BAYTRAIL = yes;
|
||||
# GPIO for Braswell and Cherryview devices
|
||||
# Needs to be built-in to for integrated keyboards to function properly
|
||||
PINCTRL_CHERRYVIEW = yes;
|
||||
# 8 is default. Modern gpt tables on eMMC may go far beyond 8.
|
||||
MMC_BLOCK_MINORS = freeform "32";
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "atlassian-confluence";
|
||||
version = "7.12.2";
|
||||
version = "7.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-SZFyHU6Uy/opwfW0B+hnp+3wQkf+6w2/P25JH+BfLGY=";
|
||||
sha256 = "1lcwdjby18xr54i408kncfhlizf18xcrnhfgsvhx5m02arid7mk7";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atlassian-crowd";
|
||||
version = "4.2.0";
|
||||
version = "4.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz";
|
||||
sha256 = "1gg4jcwvk4za6j4260dx1vz2dprrnqv8paqf6z86s7ka3y1nx1aj";
|
||||
sha256 = "0ipfvdjs8v02y37rmihljy9lkb3ycz5hyc14mcg65ilsscsq3x91";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atlassian-jira";
|
||||
version = "8.19.0";
|
||||
version = "8.20.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
|
||||
sha256 = "sha256-ewunieLbHCfdS/JjKo9P6S6kK98aUGsyfupUcMyULo4=";
|
||||
sha256 = "0jygjl5irmnlmc4m2y76b5vj1igyw5ax39gygjzbhwy41zah9p4z";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "influxdb";
|
||||
version = "1.8.9";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LavOnVREu7uLWcdM9zIonqoYPJBdY2j5eKMeVNXa1dk=";
|
||||
sha256 = "sha256-PErAxRpSi1Kk6IpEAhsUSxCGYeY4p6bbhwLdbRB0M00=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jgAbEWXL1LYRN7ud9ij0Z1KBGHPZ0sRq78tsK92ob8k=";
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "0.28.4";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liquidata-inc";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J/4YEiSmoWhs+pnJN21CwNwpujZ1cldLmgwajBB+IRU=";
|
||||
sha256 = "sha256-03cWsZEPjsUPyrGoU+RFkPb/BjYfLgO5sE50k9U1GjQ=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
|
||||
vendorSha256 = "sha256-l3jRQ4Z7xku1nMfYfc6nJ3qF6A1maY0tRfZpHCtsujI=";
|
||||
vendorSha256 = "sha256-7nmpsmisrtBxdLgC9mwSDYbjtbCrGl564+deC9CaYps=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gcsfuse";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googlecloudplatform";
|
||||
repo = "gcsfuse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qsvHqSvMG7VwRtNmyun2oO+ZRZ1D1spefTeUXrWGSNk=";
|
||||
sha256 = "sha256-X7EZKHdSWQ9HKaXtoeDGNnzsBmffqHvZ6rfQXpjYTB8=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-sql-proxy";
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "cloudsql-proxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "0vz5fm1bgh2g7b320hchpfb4iql1src1rpm7324sqcd26p7w3mnl";
|
||||
sha256 = "sha256-Xgz8ku6szzbgL3cyiggHJYaj4aUhaqgIOUnwKUE1AeY=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/cloud_sql_proxy" ];
|
||||
|
||||
vendorSha256 = "04y6zx3jdyj07d68a4vk4p5rzvvjnvdwk9kkipmlmqg1xqwlb84m";
|
||||
vendorSha256 = "sha256-7KiLJoQ0xH35ae4NGODF4t1S9h86L0TJbCqFVm+bBmk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "convimg";
|
||||
version = "8.3";
|
||||
version = "8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mateoconlechuga";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1k2fkzfg08y2gcm8jabmb2plgqmgw6y30m73ys4mmbskxgy7hc3s";
|
||||
sha256 = "sha256-JTKyOjeiu6FAUrDPDAwLBVgZwmNY11wHonqEV1ukRpw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
sha256 = "sha256-BKiuYvxgY2P7GK59jul5l0kHNrJtD2jmsMGmX0+09hY=";
|
||||
sha256 = "sha256-PEteip6FcaJ2wqdhSM9SqL7bJ4nimcOrC3s2pWunEIE=";
|
||||
};
|
||||
|
||||
# Substitute instead of wrapping because the resulting file is
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cariddi";
|
||||
version = "1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edoardottt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cwkycydwndda11m1jszbxchpqabrgspj17y2aj3y3m2x446h27z";
|
||||
sha256 = "sha256-5FXHJvHrfmttesgI6IE3+AedLXf1skWV12+WjbR4Xy8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0rmiya517i9s4l9nxzwly5vq8cqhhpq66rc7y4sapyaihx20ai3r";
|
||||
vendorSha256 = "sha256-ZIlOPOrAWdwHwgUR/9eBEXaIcNfWh7yEQ/c9iE8sLiY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Crawler for URLs and endpoints";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doppler";
|
||||
version = "3.31.1";
|
||||
version = "3.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dopplerhq";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-m8dugkZ0n51RnclZwKGgjVG3OrDMz3MsOQMvNbG4BPU=";
|
||||
sha256 = "sha256-Eb6msMl5X8ct9XlVlrxbnkXSEouzK/jCW94qm3PTXBQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8=";
|
||||
vendorSha256 = "sha256-VPxHxNtDeP5CFDMTeMsZYED9ZGWMquJdeupeCVldY/E=";
|
||||
|
||||
ldflags = [ "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -419,6 +419,10 @@ let
|
|||
|
||||
getopt = callPackage ../development/ocaml-modules/getopt { };
|
||||
|
||||
gluten = callPackage ../development/ocaml-modules/gluten { };
|
||||
gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { };
|
||||
gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { };
|
||||
|
||||
gmap = callPackage ../development/ocaml-modules/gmap { };
|
||||
|
||||
gnuplot = callPackage ../development/ocaml-modules/gnuplot {
|
||||
|
|
@ -1034,6 +1038,8 @@ let
|
|||
|
||||
phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { };
|
||||
|
||||
piaf = callPackage ../development/ocaml-modules/piaf { };
|
||||
|
||||
piqi = callPackage ../development/ocaml-modules/piqi { };
|
||||
|
||||
piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { };
|
||||
|
|
|
|||
|
|
@ -44,6 +44,8 @@ mapAliases ({
|
|||
diff_cover = diff-cover; # added 2021-07-02
|
||||
discogs_client = discogs-client; # added 2021-07-02
|
||||
djangorestframework-jwt = drf-jwt; # added 2021-07-20
|
||||
django_redis = django-redis; # added 2021-10-11
|
||||
django_taggit = django-taggit; # added 2021-10-11
|
||||
dns = dnspython; # added 2017-12-10
|
||||
dogpile_cache = dogpile-cache; # added 2021-10-28
|
||||
faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
|
||||
|
|
|
|||
|
|
@ -2124,6 +2124,8 @@ in {
|
|||
|
||||
django-formtools = callPackage ../development/python-modules/django-formtools { };
|
||||
|
||||
django-graphiql-debug-toolbar = callPackage ../development/python-modules/django-graphiql-debug-toolbar { };
|
||||
|
||||
django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { };
|
||||
|
||||
django_guardian = callPackage ../development/python-modules/django_guardian { };
|
||||
|
|
@ -2139,6 +2141,8 @@ in {
|
|||
|
||||
django-jinja = callPackage ../development/python-modules/django-jinja2 { };
|
||||
|
||||
django-js-asset = callPackage ../development/python-modules/django-js-asset { };
|
||||
|
||||
django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { };
|
||||
|
||||
django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
|
||||
|
|
@ -2149,6 +2153,8 @@ in {
|
|||
|
||||
django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { };
|
||||
|
||||
django-mptt = callPackage ../development/python-modules/django-mptt { };
|
||||
|
||||
django_nose = callPackage ../development/python-modules/django_nose { };
|
||||
|
||||
django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { };
|
||||
|
|
@ -2163,6 +2169,8 @@ in {
|
|||
|
||||
django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { };
|
||||
|
||||
django-prometheus = callPackage ../development/python-modules/django-prometheus { };
|
||||
|
||||
django-q = callPackage ../development/python-modules/django-q { };
|
||||
|
||||
djangoql = callPackage ../development/python-modules/djangoql { };
|
||||
|
|
@ -2171,10 +2179,12 @@ in {
|
|||
|
||||
django-raster = callPackage ../development/python-modules/django-raster { };
|
||||
|
||||
django_redis = callPackage ../development/python-modules/django_redis { };
|
||||
django-redis = callPackage ../development/python-modules/django-redis { };
|
||||
|
||||
django-rest-auth = callPackage ../development/python-modules/django-rest-auth { };
|
||||
|
||||
django-rq = callPackage ../development/python-modules/django-rq { };
|
||||
|
||||
djangorestframework = callPackage ../development/python-modules/djangorestframework { };
|
||||
|
||||
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
|
||||
|
|
@ -2197,9 +2207,13 @@ in {
|
|||
|
||||
django-storages = callPackage ../development/python-modules/django-storages { };
|
||||
|
||||
django-tables2 = callPackage ../development/python-modules/django-tables2 { };
|
||||
|
||||
django_tagging = callPackage ../development/python-modules/django_tagging { };
|
||||
|
||||
django_taggit = callPackage ../development/python-modules/django_taggit { };
|
||||
django-taggit = callPackage ../development/python-modules/django-taggit { };
|
||||
|
||||
django-timezone-field = callPackage ../development/python-modules/django-timezone-field { };
|
||||
|
||||
django_treebeard = callPackage ../development/python-modules/django_treebeard { };
|
||||
|
||||
|
|
@ -3279,6 +3293,8 @@ in {
|
|||
|
||||
graphene = callPackage ../development/python-modules/graphene { };
|
||||
|
||||
graphene-django = callPackage ../development/python-modules/graphene-django { };
|
||||
|
||||
graphqlclient= callPackage ../development/python-modules/graphqlclient { };
|
||||
|
||||
graphql-core = callPackage ../development/python-modules/graphql-core { };
|
||||
|
|
@ -4571,6 +4587,8 @@ in {
|
|||
|
||||
markdown = callPackage ../development/python-modules/markdown { };
|
||||
|
||||
markdown-include = callPackage ../development/python-modules/markdown-include { };
|
||||
|
||||
markdown-it-py = callPackage ../development/python-modules/markdown-it-py { };
|
||||
|
||||
markdown-macros = callPackage ../development/python-modules/markdown-macros { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue