mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-23 12:34:15 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
30ae8398a9
@ -1,5 +1,26 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }: let
|
||||
inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
|
||||
|
||||
mkNode = vlan: id: {
|
||||
virtualisation.vlans = [ vlan ];
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
useNetworkd = true;
|
||||
};
|
||||
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
|
||||
networks."10-eth${toString vlan}" = {
|
||||
matchConfig.Name = "eth${toString vlan}";
|
||||
linkConfig.RequiredForOnline = "no";
|
||||
networkConfig = {
|
||||
Address = "192.168.${toString vlan}.${toString id}/24";
|
||||
IPForward = "yes";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
name = "systemd-networkd-vrf";
|
||||
meta.maintainers = with lib.maintainers; [ ma27 ];
|
||||
@ -54,7 +75,7 @@ in {
|
||||
linkConfig.RequiredForOnline = "no";
|
||||
networkConfig = {
|
||||
VRF = "vrf1";
|
||||
Address = "192.168.1.1";
|
||||
Address = "192.168.1.1/24";
|
||||
IPForward = "yes";
|
||||
};
|
||||
};
|
||||
@ -63,78 +84,23 @@ in {
|
||||
linkConfig.RequiredForOnline = "no";
|
||||
networkConfig = {
|
||||
VRF = "vrf2";
|
||||
Address = "192.168.2.1";
|
||||
Address = "192.168.2.1/24";
|
||||
IPForward = "yes";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
node1 = { pkgs, ... }: {
|
||||
virtualisation.vlans = [ 1 ];
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
useNetworkd = true;
|
||||
};
|
||||
|
||||
node1 = lib.mkMerge [
|
||||
(mkNode 1 2)
|
||||
{
|
||||
services.openssh.enable = true;
|
||||
users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
|
||||
}
|
||||
];
|
||||
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
|
||||
networks."10-eth1" = {
|
||||
matchConfig.Name = "eth1";
|
||||
linkConfig.RequiredForOnline = "no";
|
||||
networkConfig = {
|
||||
Address = "192.168.1.2";
|
||||
IPForward = "yes";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
node2 = { pkgs, ... }: {
|
||||
virtualisation.vlans = [ 2 ];
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
useNetworkd = true;
|
||||
};
|
||||
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
|
||||
networks."10-eth2" = {
|
||||
matchConfig.Name = "eth2";
|
||||
linkConfig.RequiredForOnline = "no";
|
||||
networkConfig = {
|
||||
Address = "192.168.2.3";
|
||||
IPForward = "yes";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
node3 = { pkgs, ... }: {
|
||||
virtualisation.vlans = [ 2 ];
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
useNetworkd = true;
|
||||
};
|
||||
|
||||
systemd.network = {
|
||||
enable = true;
|
||||
|
||||
networks."10-eth2" = {
|
||||
matchConfig.Name = "eth2";
|
||||
linkConfig.RequiredForOnline = "no";
|
||||
networkConfig = {
|
||||
Address = "192.168.2.4";
|
||||
IPForward = "yes";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
node2 = mkNode 2 3;
|
||||
node3 = mkNode 2 4;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
@ -159,22 +125,6 @@ in {
|
||||
node2.wait_for_unit("network.target")
|
||||
node3.wait_for_unit("network.target")
|
||||
|
||||
client_ipv4_table = """
|
||||
192.168.1.2 dev vrf1 proto static metric 100\x20
|
||||
192.168.2.3 dev vrf2 proto static metric 100
|
||||
""".strip()
|
||||
vrf1_table = """
|
||||
192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1\x20
|
||||
local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1\x20
|
||||
broadcast 192.168.1.255 dev eth1 proto kernel scope link src 192.168.1.1
|
||||
""".strip()
|
||||
vrf2_table = """
|
||||
192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1\x20
|
||||
local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1\x20
|
||||
broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1
|
||||
""".strip()
|
||||
# editorconfig-checker-enable
|
||||
|
||||
# Check that networkd properly configures the main routing table
|
||||
# and the routing tables for the VRF.
|
||||
with subtest("check vrf routing tables"):
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "helio-workstation";
|
||||
version = "3.10";
|
||||
version = "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helio-fm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-TqwebaFZXUto+azVJQlggqAc7WKDxAaXxyXcG8x5S/w=";
|
||||
sha256 = "sha256-ec4ueg6TNo3AaZ81j01OQZzhgOfSzG1/Vd0QhEXOUl0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1442,11 +1442,31 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-graphql";
|
||||
publisher = "GraphQL";
|
||||
version = "0.8.6";
|
||||
sha256 = "sha256-iQWDYdz/TG8pxPEq9RirNtY4kwhpK+gO0It6OTdrM+0=";
|
||||
version = "0.8.7";
|
||||
sha256 = "sha256-u3VcpgLKiEeUr1I6w71wleKyaO6v0gmHiw5Ama6fv88=";
|
||||
};
|
||||
meta = {
|
||||
description = "GraphQL extension for VSCode built with the aim to tightly integrate the GraphQL Ecosystem with VSCode for an awesome developer experience.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql";
|
||||
homepage = "https://github.com/graphql/graphiql/tree/main/packages/vscode-graphql";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.Enzime ];
|
||||
};
|
||||
};
|
||||
|
||||
graphql.vscode-graphql-syntax = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-graphql-syntax";
|
||||
publisher = "GraphQL";
|
||||
version = "1.1.0";
|
||||
sha256 = "sha256-qazU0UyZ9de6Huj2AYZqqBo4jVW/ZQmFJhV7XXAblxo=";
|
||||
};
|
||||
meta = {
|
||||
description = "Adds full GraphQL syntax highlighting and language support such as bracket matching.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql-syntax";
|
||||
homepage = "https://github.com/graphql/graphiql/tree/main/packages/vscode-graphql-syntax";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.Enzime ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mob";
|
||||
version = "4.4.1";
|
||||
version = "4.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ovp+JsNqFcOMk054khSdvPebFsv/fQD1Ghox8J3YcgA=";
|
||||
sha256 = "sha256-muKlzOrqtegy35QcGJvwYqIJ9XZsaAvyofsrWPqCi7k=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeshark";
|
||||
version = "40.1";
|
||||
version = "40.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshark";
|
||||
repo = "kubeshark";
|
||||
rev = version;
|
||||
sha256 = "sha256-hRAV8Nnph52Q7fdvW68Ma4DUM0lQdL6e0v1reR/G9Fs=";
|
||||
sha256 = "sha256-E39Hr39fPiRKElploh2EEE35x0vnyAf2eWHr8Ifx0l0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU=";
|
||||
@ -55,6 +55,6 @@ buildGoModule rec {
|
||||
Think TCPDump and Wireshark re-invented for Kubernetes
|
||||
capturing, dissecting and monitoring all traffic and payloads going in, out and across containers, pods, nodes and clusters.
|
||||
'';
|
||||
maintainers = with maintainers; [ bryanasdev000 ];
|
||||
maintainers = with maintainers; [ bryanasdev000 qjoly ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical user inteface for GAMESS-US";
|
||||
description = "Graphical user interface for GAMESS-US";
|
||||
homepage = "https://brettbode.github.io/wxmacmolplt/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
{ pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args:
|
||||
|
||||
let Dune =
|
||||
let dune-version = args.duneVersion or "2"; in
|
||||
let dune-version = args.duneVersion or "3"; in
|
||||
{ "1" = dune_1; "2" = dune_2; "3" = dune_3; }."${dune-version}"
|
||||
; in
|
||||
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-terminal";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "08mgxbviik2dwwnbclp0518wlag2fhcr6c2yadgcbhwiq4aff9vp";
|
||||
sha256 = "fBMCBvC0eIfoySdOc/jBn65RETRXKGmnwjERt4nh4dA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-user-guide";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085";
|
||||
sha256 = "XQTJdLd/L/OQQkQ4mY6F7ErdjiJnJA51WnqODvd/wi8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pluma";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0lway12q2xygiwjgrx7chgka838jbnmlzz98g7agag1rwzd481ii";
|
||||
sha256 = "WVns49cRjhBmWfZNIC0O0XY60Qu7ul0qzYy/ui45lPE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,18 +15,35 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "ligo";
|
||||
version = "0.64.2";
|
||||
version = "0.65.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "sha256-/XUJFDH1pv65VeZt57P+AiCegTwCn7OWdaa0D8sw7CI=";
|
||||
sha256 = "sha256-vBvgagXK9lOXRI+iBwkPKmUvncZjrqHpKI3UAqOzHvc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace "vendors/tezos-ligo/src/lib_hacl/hacl.ml" \
|
||||
--replace \
|
||||
"Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg" \
|
||||
"Hacl.NaCl.Noalloc.Easy.secretbox ~pt:msg ~n:nonce ~key ~ct:cmsg ()" \
|
||||
--replace \
|
||||
"Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg" \
|
||||
"Hacl.NaCl.Noalloc.Easy.box_afternm ~pt:msg ~n:nonce ~ck:k ~ct:cmsg ()"
|
||||
|
||||
substituteInPlace "vendors/tezos-ligo/src/lib_crypto/crypto_box.ml" \
|
||||
--replace \
|
||||
"secretbox_open ~key ~nonce ~cmsg ~msg" \
|
||||
"secretbox_open ~key ~nonce ~cmsg ~msg ()" \
|
||||
--replace \
|
||||
"Box.box_open ~k ~nonce ~cmsg ~msg" \
|
||||
"Box.box_open ~k ~nonce ~cmsg ~msg ()"
|
||||
'';
|
||||
|
||||
# The build picks this up for ligo --version
|
||||
LIGO_VERSION = version;
|
||||
CHANGELOG_PATH = "./changelog.txt";
|
||||
|
||||
# This is a hack to work around the hack used in the dune files
|
||||
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
|
||||
@ -115,13 +132,6 @@ ocamlPackages.buildDunePackage rec {
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# The scripts use `nix-shell` in the shebang which seems to fail
|
||||
sed -i -e '1,5d' ./scripts/changelog-generation.sh
|
||||
sed -i -e '1,5d' ./scripts/changelog-json.sh
|
||||
./scripts/changelog-generation.sh
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
cacert
|
||||
ocamlPackages.ca-certs
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, mesonEmulatorHook
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, gettext
|
||||
, vala
|
||||
, glib
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grilo";
|
||||
version = "0.3.15"; # if you change minor, also change ./setup-hook.sh
|
||||
version = "0.3.16"; # if you change minor, also change ./setup-hook.sh
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
@ -32,16 +32,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "81Ks9zZlZpk0JwY2/t5mtS2mgB/iD2OMQEirJnhXey0=";
|
||||
sha256 = "iEWA6MXs4oDfI6pj/1I0t9SJiKQE331r/M0ed7RzvZY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/grilo/-/commit/b0d75be00b06cb0163dabbedecf9122a55273349.patch";
|
||||
sha256 = "sha256-Hwnc3TLN6n3w/MAFcprHv7nbTcwRfI0cmfDriNLnAvQ=";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-gtk-doc=true"
|
||||
];
|
||||
@ -50,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
gettext
|
||||
gobject-introspection
|
||||
vala
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Voronoi intergration of electron densities";
|
||||
description = "Library for Voronoi integration of electron densities";
|
||||
homepage = "https://brehm-research.de/libvori.php";
|
||||
license = with licenses; [ lgpl3Only ];
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -1,17 +1,15 @@
|
||||
{ lib, buildDunePackage, dune_2, dune-action-plugin }:
|
||||
{ lib, buildDunePackage, dune-action-plugin }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "dune-build-info";
|
||||
inherit (dune_2) src version patches;
|
||||
|
||||
useDune2 = true;
|
||||
inherit (dune-action-plugin) src version preBuild;
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
buildInputs = [ dune-action-plugin ];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (dune_2.meta) homepage;
|
||||
inherit (dune-action-plugin.meta) homepage;
|
||||
description = "Embed build information inside executables";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
license = licenses.mit;
|
||||
|
||||
@ -1,17 +1,20 @@
|
||||
{ lib, buildDunePackage, dune_2, csexp, result }:
|
||||
{ lib, buildDunePackage, dune_3, csexp }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "dune-configurator";
|
||||
|
||||
inherit (dune_2) src version patches;
|
||||
inherit (dune_3) src version patches;
|
||||
|
||||
duneVersion = "2";
|
||||
# This fixes finding csexp
|
||||
postPatch = ''
|
||||
rm -rf vendor/pp vendor/csexp
|
||||
'';
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.05";
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
propagatedBuildInputs = [ csexp result ];
|
||||
propagatedBuildInputs = [ csexp ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helper library for gathering system configuration";
|
||||
|
||||
@ -4,7 +4,7 @@ buildDunePackage rec {
|
||||
pname = "lame";
|
||||
version = "0.3.6";
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
|
||||
@ -4,6 +4,8 @@ buildDunePackage rec {
|
||||
pname = "lo";
|
||||
version = "0.2.0";
|
||||
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-lo";
|
||||
|
||||
@ -6,6 +6,8 @@ buildDunePackage rec {
|
||||
|
||||
inherit (ocaml_gettext) src version;
|
||||
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
||||
propagatedBuildInputs = [ ocaml_gettext ];
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
{ lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (rec {
|
||||
minimalOCamlVersion = "4.04";
|
||||
|
||||
pname = "ounit2";
|
||||
version = "2.2.6";
|
||||
|
||||
duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "2" else "1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz";
|
||||
hash = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM=";
|
||||
@ -24,4 +22,6 @@ buildDunePackage rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sternenseemann ];
|
||||
};
|
||||
}
|
||||
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
|
||||
duneVersion = "1";
|
||||
})
|
||||
|
||||
@ -10,7 +10,7 @@ buildDunePackage rec {
|
||||
sha256 = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@ -4,8 +4,6 @@ buildDunePackage rec {
|
||||
pname = "shine";
|
||||
version = "0.2.3";
|
||||
|
||||
duneVersion = "2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-shine";
|
||||
|
||||
49
pkgs/development/python-modules/inlinestyler/default.nix
Normal file
49
pkgs/development/python-modules/inlinestyler/default.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# dependencies
|
||||
, cssutils
|
||||
, lxml
|
||||
, requests
|
||||
|
||||
# tests
|
||||
, ipdb
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inlinestyler";
|
||||
version = "0.2.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlanger";
|
||||
repo = "inlinestyler";
|
||||
rev = version;
|
||||
hash = "sha256-9TKXqW+5SiiNXnHW2lOVh3zhFhodM7a1UB2yXsEuX3I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cssutils
|
||||
lxml
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"inlinestyler"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
ipdb
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple CSS inliner for generating HTML email messages";
|
||||
homepage = "https://github.com/dlanger/inlinestyler";
|
||||
changelog = "https://github.com/dlanger/inlinestyler/blob/${src.rev}/CHANGELOG";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jdatetime";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-SmeoLuV+NbX2+ff75qDtpj9Wzh3Yr0CbTComozQEV9s=";
|
||||
hash = "sha256-HdDuIQFgx70wACgDxEPmJgrGAuplsGVlKh1WfTv9yno=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -52,6 +52,7 @@
|
||||
, duckduckgo-search
|
||||
, lark
|
||||
, jq
|
||||
, protobuf
|
||||
# test dependencies
|
||||
, pytest-vcr
|
||||
, pytest-asyncio
|
||||
@ -66,7 +67,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "0.0.163";
|
||||
version = "0.0.166";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -75,7 +76,7 @@ buildPythonPackage rec {
|
||||
owner = "hwchase17";
|
||||
repo = "langchain";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3oebRLMunzfz+fAS5h+HaabioIPXTJLJc0YAktLx4/U=";
|
||||
hash = "sha256-i6CvboYZigky49a7X8RuQH2EfcucJPtEtFEzZxaNJG8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -190,6 +191,9 @@ buildPythonPackage rec {
|
||||
# pyvespa
|
||||
# O365
|
||||
jq
|
||||
# docarray
|
||||
protobuf
|
||||
# hnswlib
|
||||
];
|
||||
};
|
||||
|
||||
@ -204,10 +208,10 @@ buildPythonPackage rec {
|
||||
responses
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
pytestFlagsArray = [
|
||||
# integration_tests have many network, db access and require `OPENAI_API_KEY`, etc.
|
||||
rm -r tests/integration_tests
|
||||
'';
|
||||
"--ignore=tests/integration_tests"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# these tests have db access
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pika";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pika";
|
||||
repo = "pika";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-j+5AF/+MlyMl3JXh+bo7pHxohbso17CJokcDR7uroz8=";
|
||||
hash = "sha256-60Z+y3YXazUghfnOy4e7HzM18iju5m5OEt4I3Wg6ty4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ gevent tornado twisted ];
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
, OVMFFull
|
||||
, quickemu
|
||||
, testers
|
||||
, installShellFiles
|
||||
}:
|
||||
let
|
||||
runtimePaths = [
|
||||
@ -67,11 +68,12 @@ stdenv.mkDerivation rec {
|
||||
quickemu
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.1
|
||||
install -Dm755 -t "$out/bin" macrecovery quickemu quickget windowskey
|
||||
|
||||
# spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection
|
||||
|
||||
@ -394,6 +394,7 @@ stdenv.mkDerivation rec {
|
||||
for wrapper in "''${wrappers[@]}"; do
|
||||
sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper
|
||||
sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
|
||||
sed -i -e "s,/usr/bin/xcrun install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
631
pkgs/development/tools/git-ps-rs/Cargo.lock
generated
631
pkgs/development/tools/git-ps-rs/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -12,13 +12,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-ps-rs";
|
||||
version = "6.6.0";
|
||||
version = "6.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uptech";
|
||||
repo = "git-ps-rs";
|
||||
rev = version;
|
||||
hash = "sha256-pWad/OCSoszdEQb6Mb6fD4vsZRagbYa3TKft4IyGg94=";
|
||||
hash = "sha256-yBZ+YJxiVO8+rI7FLtI0xse8hoirjt5Bc2KxPeBidd0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
gpgme # gpgme runs a small script at build time so has to go here
|
||||
];
|
||||
|
||||
buildInputs = [ openssl dbus libgpg-error ]
|
||||
buildInputs = [ openssl dbus libgpg-error gpgme ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,7 +6,7 @@ buildDunePackage rec {
|
||||
pname = "js_of_ocaml-ocamlbuild";
|
||||
version = "5.0";
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocsigen/js_of_ocaml-ocamlbuild/releases/download/${version}/js_of_ocaml-ocamlbuild-${version}.tbz";
|
||||
|
||||
583
pkgs/development/tools/rust/cargo-edit/Cargo.lock
generated
583
pkgs/development/tools/rust/cargo-edit/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-edit";
|
||||
version = "0.11.9";
|
||||
version = "0.11.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "killercup";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2anmuenywCdmPncsof2nD0xrerMFMP3yhTMXs+Qux0s=";
|
||||
hash = "sha256-pxlwCeGOH0uqPdDJ7zIXFIRBuHwyByZ5r1VWzluvz10=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
31
pkgs/development/tools/sea-orm-cli/default.nix
Normal file
31
pkgs/development/tools/sea-orm-cli/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, pkg-config
|
||||
, openssl
|
||||
, darwin
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sea-orm-cli";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-VRSdPsjRubJOsjdAxdnFCM9VmAVwGkXDvpXT4GF2jxY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
|
||||
|
||||
cargoHash = "sha256-4lPtj11Gc+0r2WQT8gx8eX+YK5L+HnUBR0w6pm3VlRQ=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sea-ql.org/SeaORM";
|
||||
description = " Command line utility for SeaORM";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ traxys ];
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
From 329ad7cb56e66464e5570bbb51dea0fd56c4d9ae Mon Sep 17 00:00:00 2001
|
||||
From 1b6ad143c0f5f96c42f603bb93a72f788b88b622 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sun, 19 Feb 2023 17:40:50 +0000
|
||||
Date: Fri, 12 May 2023 08:12:04 +0100
|
||||
Subject: [PATCH 1/2] nixpkgs: use system Python
|
||||
|
||||
---
|
||||
@ -9,11 +9,11 @@ Subject: [PATCH 1/2] nixpkgs: use system Python
|
||||
2 files changed, 1 insertion(+), 16 deletions(-)
|
||||
|
||||
diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
|
||||
index a5c3283d0a..1c2c31ebf2 100644
|
||||
index 37c0183664..0bee5feb7e 100644
|
||||
--- a/bazel/python_dependencies.bzl
|
||||
+++ b/bazel/python_dependencies.bzl
|
||||
@@ -1,10 +1,8 @@
|
||||
load("@rules_python//python:pip.bzl", "pip_install", "pip_parse")
|
||||
@@ -1,24 +1,20 @@
|
||||
load("@rules_python//python:pip.bzl", "pip_parse")
|
||||
-load("@python3_10//:defs.bzl", "interpreter")
|
||||
|
||||
def envoy_python_dependencies():
|
||||
@ -23,13 +23,12 @@ index a5c3283d0a..1c2c31ebf2 100644
|
||||
requirements_lock = "@envoy//tools/base:requirements.txt",
|
||||
extra_pip_args = ["--require-hashes"],
|
||||
)
|
||||
@@ -12,14 +10,12 @@ def envoy_python_dependencies():
|
||||
# TODO(phlax): switch to `pip_parse`
|
||||
pip_install(
|
||||
# Note: dev requirements do *not* check hashes
|
||||
- python_interpreter_target = interpreter,
|
||||
|
||||
pip_parse(
|
||||
name = "dev_pip3",
|
||||
requirements = "@envoy//tools/dev:requirements.txt",
|
||||
- python_interpreter_target = interpreter,
|
||||
requirements_lock = "@envoy//tools/dev:requirements.txt",
|
||||
extra_pip_args = ["--require-hashes"],
|
||||
)
|
||||
|
||||
pip_parse(
|
||||
@ -68,5 +67,5 @@ index 9d1b31c5d6..ac5605eb30 100644
|
||||
-
|
||||
aspect_bazel_lib_dependencies()
|
||||
--
|
||||
2.39.1
|
||||
2.40.0
|
||||
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
From 31d864a3b6a1a3455191e87ff680eb812f77dc3c Mon Sep 17 00:00:00 2001
|
||||
From 30e059d652bd4e352e2c1dc3c44d03a1e42ff912 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Sun, 19 Feb 2023 17:43:03 +0000
|
||||
Date: Fri, 12 May 2023 08:13:21 +0100
|
||||
Subject: [PATCH 2/2] nixpkgs: use system Go
|
||||
|
||||
---
|
||||
bazel/dependency_imports.bzl | 29 +----------------------------
|
||||
bazel/repositories.bzl | 3 ---
|
||||
bazel/repository_locations.bzl | 4 ++--
|
||||
3 files changed, 3 insertions(+), 33 deletions(-)
|
||||
2 files changed, 1 insertion(+), 31 deletions(-)
|
||||
|
||||
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
|
||||
index 7dbdb0174e..e73662ed79 100644
|
||||
index 681617f1b8..a10c560baf 100644
|
||||
--- a/bazel/dependency_imports.bzl
|
||||
+++ b/bazel/dependency_imports.bzl
|
||||
@@ -15,7 +15,7 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis
|
||||
@@ -17,7 +17,7 @@ load("@aspect_bazel_lib//lib:repositories.bzl", "register_jq_toolchains", "regis
|
||||
load("@com_google_cel_cpp//bazel:deps.bzl", "parser_deps")
|
||||
|
||||
# go version for rules_go
|
||||
@ -22,7 +21,7 @@ index 7dbdb0174e..e73662ed79 100644
|
||||
|
||||
JQ_VERSION = "1.6"
|
||||
YQ_VERSION = "4.24.4"
|
||||
@@ -25,7 +25,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
|
||||
@@ -27,7 +27,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
|
||||
rules_foreign_cc_dependencies(register_default_tools = False, register_built_tools = False)
|
||||
go_rules_dependencies()
|
||||
go_register_toolchains(go_version)
|
||||
@ -30,7 +29,7 @@ index 7dbdb0174e..e73662ed79 100644
|
||||
gazelle_dependencies(go_sdk = "go_sdk")
|
||||
apple_rules_dependencies()
|
||||
pip_dependencies()
|
||||
@@ -134,29 +133,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
|
||||
@@ -146,29 +145,3 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
|
||||
# use_category = ["api"],
|
||||
# source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28"
|
||||
)
|
||||
@ -61,10 +60,10 @@ index 7dbdb0174e..e73662ed79 100644
|
||||
- version = go_version,
|
||||
- )
|
||||
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
|
||||
index fca05b6062..a2f60014cb 100644
|
||||
index 6d2cf2014c..a8375bcdef 100644
|
||||
--- a/bazel/repositories.bzl
|
||||
+++ b/bazel/repositories.bzl
|
||||
@@ -115,9 +115,6 @@ def _go_deps(skip_targets):
|
||||
@@ -196,9 +196,6 @@ def _go_deps(skip_targets):
|
||||
if "io_bazel_rules_go" not in skip_targets:
|
||||
external_http_archive(
|
||||
name = "io_bazel_rules_go",
|
||||
@ -74,21 +73,6 @@ index fca05b6062..a2f60014cb 100644
|
||||
)
|
||||
external_http_archive("bazel_gazelle")
|
||||
|
||||
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
|
||||
index e4e89d281a..fb62c4f8f3 100644
|
||||
--- a/bazel/repository_locations.bzl
|
||||
+++ b/bazel/repository_locations.bzl
|
||||
@@ -878,8 +878,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
|
||||
project_name = "Go rules for Bazel",
|
||||
project_desc = "Bazel rules for the Go language",
|
||||
project_url = "https://github.com/bazelbuild/rules_go",
|
||||
- version = "0.36.0",
|
||||
- sha256 = "ae013bf35bd23234d1dea46b079f1e05ba74ac0321423830119d3e787ec73483",
|
||||
+ version = "0.38.1",
|
||||
+ sha256 = "dd926a88a564a9246713a9c00b35315f54cbd46b31a26d5d8fb264c07045f05d",
|
||||
urls = ["https://github.com/bazelbuild/rules_go/releases/download/v{version}/rules_go-v{version}.zip"],
|
||||
use_category = ["build", "api"],
|
||||
release_date = "2022-11-23",
|
||||
--
|
||||
2.39.1
|
||||
2.40.0
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, bazel_5
|
||||
, bazel_6
|
||||
, bazel-gazelle
|
||||
, buildBazelPackage
|
||||
, fetchFromGitHub
|
||||
@ -24,19 +24,19 @@ let
|
||||
# However, the version string is more useful for end-users.
|
||||
# These are contained in a attrset of their own to make it obvious that
|
||||
# people should update both.
|
||||
version = "1.25.1";
|
||||
rev = "bae2e9d642a6a8ae6c5d3810f77f3e888f0d97da";
|
||||
version = "1.26.1";
|
||||
rev = "c7e8e7356d3a969c1b8e4e1f2687699acd91c6a1";
|
||||
};
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
pname = "envoy";
|
||||
inherit (srcVer) version;
|
||||
bazel = bazel_5;
|
||||
bazel = bazel_6;
|
||||
src = fetchFromGitHub {
|
||||
owner = "envoyproxy";
|
||||
repo = "envoy";
|
||||
inherit (srcVer) rev;
|
||||
sha256 = "sha256-qA3+bta2vXGtAYX3mg+CmSIEitk4576JQB/QLPsj9Vc=";
|
||||
sha256 = "sha256-WHedup6z/9t/Jg6CBrwtDy9xv6IwO3gUuBqos4h+k2s=";
|
||||
|
||||
postFetch = ''
|
||||
chmod -R +w $out
|
||||
@ -80,8 +80,8 @@ buildBazelPackage rec {
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-koz08NWUq5Fkca++1G7WEmg24G6FuMQOgRN3+HBtNIk=";
|
||||
aarch64-linux = "sha256-oSybAw58yK0BUhS8MU2Y9hRo0mU/7xT7VKU3tDW4xN0=";
|
||||
x86_64-linux = "sha256-jx8RavJKlBtZQtZf4GrUkOlhM6qI4LO5lK3HRgn1vzE=";
|
||||
aarch64-linux = "sha256-toEPrGVh61sHsVbhsideMmnX8uXIN+2x8LuZpczTEdw=";
|
||||
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
dontUseCmakeConfigure = true;
|
||||
dontUseGnConfigure = true;
|
||||
@ -176,13 +176,5 @@ buildBazelPackage rec {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lukegb ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
knownVulnerabilities = [
|
||||
"CVE-2023-27487"
|
||||
"CVE-2023-27488"
|
||||
"CVE-2023-27491"
|
||||
"CVE-2023-27492"
|
||||
"CVE-2023-27493"
|
||||
"CVE-2023-27496"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
|
||||
},
|
||||
"invidious": {
|
||||
"rev": "97e3938f5f6741d8645c1bdd37deebc6ddc06151",
|
||||
"sha256": "sha256-JxJTbVcGp2fHAh2vxGAjAeoIYx/YUassgyu7d6kIelk=",
|
||||
"version": "unstable-2023-04-30"
|
||||
"rev": "10fee9da618db8ffe6a3952d547d4e85d144877e",
|
||||
"sha256": "sha256-ZMPOsdyTtmxv/GJvLU9aPpXmLSsLqpKXaG5/u1166rw=",
|
||||
"version": "unstable-2023-05-08"
|
||||
},
|
||||
"lsquic": {
|
||||
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
|
||||
|
||||
@ -2,30 +2,33 @@
|
||||
, fetchFromGitHub
|
||||
, buildPgxExtension
|
||||
, postgresql
|
||||
, stdenv
|
||||
, nixosTests
|
||||
, cargo-pgx_0_6_1
|
||||
, cargo-pgx_0_7_1
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
(buildPgxExtension.override {cargo-pgx = cargo-pgx_0_6_1;})rec {
|
||||
(buildPgxExtension.override {cargo-pgx = cargo-pgx_0_7_1;})rec {
|
||||
inherit postgresql;
|
||||
|
||||
pname = "timescaledb_toolkit";
|
||||
version = "1.14.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = "timescaledb-toolkit";
|
||||
rev = version;
|
||||
sha256 = "sha256-ADmYALsCzZGqTX0XSkCif7ndvXwa8nEqddQpty4hbZ0=";
|
||||
sha256 = "sha256-aivGURTsm0dGaFq75qR3wIkXwsbvBiDEg+qLMcqKMj8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ukjJ11LmfG+k8D20rj68i43gOWUN80nf3hIAjUWXihI=";
|
||||
cargoSha256 = "sha256-AO5nSgQYvTmohXbzjWvDylnBgS2WpKP6wFOnkUx7ksI=";
|
||||
buildAndTestSubdir = "extension";
|
||||
|
||||
passthru.tests = {
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = {
|
||||
timescaledb_toolkit = nixosTests.timescaledb;
|
||||
};
|
||||
};
|
||||
|
||||
# tests take really long
|
||||
doCheck = false;
|
||||
|
||||
@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ auchter ];
|
||||
inherit (hare.meta) platforms badPlatforms;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "himitsu";
|
||||
version = "0.1";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
name = pname + "-src";
|
||||
owner = "~sircmpwn";
|
||||
repo = pname;
|
||||
rev = "003c14747fcddceb5359c9503f20c44b15fea5fa";
|
||||
hash = "sha256-tzBTDJKMuFh9anURy1aKQTmt77tI7wZDZQiOUowuomk=";
|
||||
rev = version;
|
||||
hash = "sha256-HoAntg9aQhMmff3T3/xnor7Sf3yX9qBbZlpVfyac5o8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "2.9.3";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QiegMoBy0gZMyQl2MRAwR14zXeh8wvVonyETdAzHbj0=";
|
||||
hash = "sha256-WqbJlpKwkbYWvSwVqhcPyIeKdlaNOvxmJh3XKi7b/Do=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0JNwoBqLKH1F/0Tr8o35gCSNT/2plIjIQvZRuzAZ5P8=";
|
||||
vendorHash = "sha256-yIGK7Fyr616XrZ5tQCdzontlCFegn9utrV8ZXhUQzp4=";
|
||||
|
||||
modRoot = "./v2";
|
||||
subPackages = [
|
||||
|
||||
@ -643,6 +643,8 @@ with pkgs;
|
||||
|
||||
riot-redis = callPackage ../development/tools/riot-redis { };
|
||||
|
||||
sea-orm-cli = callPackage ../development/tools/sea-orm-cli { };
|
||||
|
||||
r3ctl = qt5.callPackage ../tools/misc/r3ctl { };
|
||||
|
||||
ptouch-print = callPackage ../misc/ptouch-print { };
|
||||
|
||||
@ -4859,6 +4859,8 @@ self: super: with self; {
|
||||
|
||||
inkex = callPackage ../development/python-modules/inkex { };
|
||||
|
||||
inlinestyler = callPackage ../development/python-modules/inlinestyler { };
|
||||
|
||||
inotify = callPackage ../development/python-modules/inotify { };
|
||||
|
||||
inotify-simple = callPackage ../development/python-modules/inotify-simple { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user