mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
6176f16de2
@ -8139,6 +8139,11 @@
|
||||
githubId = 12160;
|
||||
name = "Kirill Radzikhovskyy";
|
||||
};
|
||||
kiskae = {
|
||||
github = "Kiskae";
|
||||
githubId = 546681;
|
||||
name = "Jeroen van Leusen";
|
||||
};
|
||||
kisonecat = {
|
||||
email = "kisonecat@gmail.com";
|
||||
github = "kisonecat";
|
||||
@ -12557,6 +12562,12 @@
|
||||
githubId = 4579165;
|
||||
name = "Danny Bautista";
|
||||
};
|
||||
pyxels = {
|
||||
email = "pyxels.dev@gmail.com";
|
||||
github = "Pyxels";
|
||||
githubId = 39232833;
|
||||
name = "Jonas";
|
||||
};
|
||||
q3k = {
|
||||
email = "q3k@q3k.org";
|
||||
github = "q3k";
|
||||
|
||||
@ -2714,8 +2714,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "code-spell-checker";
|
||||
publisher = "streetsidesoftware";
|
||||
version = "2.20.3";
|
||||
sha256 = "sha256-28ybNBobXoq194d9VGD9kOq/OWscJkSlgSZ7ViaNQtw=";
|
||||
version = "2.20.4";
|
||||
sha256 = "sha256-GOXKXZPEynyqRUUY0pdNwt+141kJleg74IbCP4/34R8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
|
||||
|
||||
@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper xorg.libXt ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
|
||||
buildInputs = [ xorg.libXt xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}" "exif=1"
|
||||
|
||||
43
pkgs/applications/misc/kickoff/default.nix
Normal file
43
pkgs/applications/misc/kickoff/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, fontconfig
|
||||
, pkg-config
|
||||
, wayland
|
||||
, libxkbcommon
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kickoff";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j0ru";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AolJXFolMEwoK3AtC93naphZetytzRl1yI10SP9Rnzo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Twg2C29OwXfCK/rYXnyjbhmCClnsFHz8le9h4AmzXfA=";
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
wayland
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
buildInputs = [ fontconfig ];
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/kickoff" --prefix LD_LIBRARY_PATH : "${libPath}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimalistic program launcher";
|
||||
homepage = "https://github.com/j0ru/kickoff";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ pyxels ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.10.4";
|
||||
version = "1.10.8";
|
||||
pname = "session-desktop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
|
||||
sha256 = "sha256-pSVTfZvjqWVgx3FAbIJO6e26GHZbhZBppxEptEuozQo=";
|
||||
sha256 = "sha256-r/MQlZ3dmQmQZ/FCYIIF2sh9+VXwG97PFfTIXIQijx8=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230404";
|
||||
version = "20230413";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-uDQeXEG3xTIXdzj9LaI+p5cLYy9nR2w7QTiZIJlZyQw=";
|
||||
hash = "sha256-7jIltC7YlnsvwADwKItFKKw5LUKDHux+b7frZfcNDyE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -27,11 +27,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.61.4";
|
||||
version = "0.62.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-VXna2ofhh8Hcyfp9+ekXHs68xcXF7HdcJNagJlzPV6c=";
|
||||
hash = "sha256-V3CHp0r+3Vya9lcuCfHeVQqmy9rxlN9cs5ZShoJ9XTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.8.3";
|
||||
version = "1.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-to4DP8cJakqLSjrMm6Y2vfYBZ9KgSMHxOULTF3vzu0g=";
|
||||
hash = "sha256-wJ9V47X3tofFiwOzYignycm3PTRQWcAJ9iR2r5rJeJA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -102,7 +102,7 @@ in
|
||||
stdenv.mkDerivation {
|
||||
pname = targetPrefix
|
||||
+ (if name != "" then name else "${bintoolsName}-wrapper");
|
||||
version = if bintools == null then null else bintoolsVersion;
|
||||
version = if bintools == null then "" else bintoolsVersion;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
|
||||
@ -160,7 +160,7 @@ assert nativePrefix == bintools.nativePrefix;
|
||||
stdenv.mkDerivation {
|
||||
pname = targetPrefix
|
||||
+ (if name != "" then name else "${ccName}-wrapper");
|
||||
version = if cc == null then null else ccVersion;
|
||||
version = if cc == null then "" else ccVersion;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -597,8 +597,11 @@ stdenv.mkDerivation {
|
||||
expandResponseParams = "${expand-response-params}/bin/expand-response-params";
|
||||
shell = getBin shell + shell.shellPath or "";
|
||||
gnugrep_bin = if nativeTools then "" else gnugrep;
|
||||
# stdenv.cc.cc should not be null and we have nothing better for now.
|
||||
# if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.
|
||||
cc = if nativeTools then "" else cc;
|
||||
wrapperName = "CC_WRAPPER";
|
||||
inherit suffixSalt coreutils_bin bintools cc;
|
||||
inherit suffixSalt coreutils_bin bintools;
|
||||
inherit libc_bin libc_dev libc_lib;
|
||||
inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
|
||||
};
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "adw-gtk3";
|
||||
version = "4.1";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lassekongo83";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7E+eBbsavWdraCxxtwFdvFkxTWN/XMz8obvnpxf6PQc=";
|
||||
sha256 = "sha256-x6ul5NZDWqEQfLzmpR7X5HgUmHNSbpuTnCquVEHFHL8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,6 +4,8 @@ rustPlatform.buildRustPackage {
|
||||
pname = "clippy";
|
||||
inherit (rustPlatform.rust.rustc) version src;
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
|
||||
cargoVendorDir = "vendor";
|
||||
buildAndTestSubdir = "src/tools/clippy";
|
||||
|
||||
5564
pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock
generated
Normal file
5564
pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "matrix-sdk-crypto-nodejs";
|
||||
version = "0.1.0-beta.2";
|
||||
version = "0.1.0-beta.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "matrix-rust-sdk";
|
||||
rev = "${pname}-v${version}";
|
||||
hash = "sha256-E++0tm/2d8/3zAXwovJ71uF2sxDORWyJNnA3e1Q3NLA=";
|
||||
hash = "sha256-0p+1cMn9PU+Jk2JW7G+sdzxhMaI3gEAk5w2nm05oBSU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
|
||||
./remove-duplicate-dependency.patch
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src patches;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-G2Um7vHinOuOx9U2BH14LAx+s/0Sxtlc9Nz6nPJfmU8=";
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"uniffi-0.21.0" = "sha256-blKCfCsSNtr8NtO7Let7VJ/9oGuW9Eu8j9A6/oHUcP0=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 2ddfdd0..3fcca5f 100644
|
||||
index 208ef4ff..b5045040 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1985,20 +1985,6 @@ version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
|
||||
@@ -2124,19 +2124,6 @@ dependencies = [
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "indexed_db_futures"
|
||||
-version = "0.2.3"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d26ac735f676c52305becf53264b91cea9866a8de61ccbf464405b377b9cbca9"
|
||||
-source = "git+https://github.com/Hywan/rust-indexed-db?branch=feat-factory-nodejs#5dab67890cea0ab88b967031adc09179a537d77c"
|
||||
-dependencies = [
|
||||
- "cfg-if",
|
||||
- "js-sys",
|
||||
@ -21,12 +20,12 @@ index 2ddfdd0..3fcca5f 100644
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "indexed_db_futures"
|
||||
version = "0.2.3"
|
||||
@@ -2558,8 +2544,7 @@ dependencies = [
|
||||
name = "indexmap"
|
||||
version = "1.9.1"
|
||||
@@ -2726,8 +2713,7 @@ dependencies = [
|
||||
"derive_builder",
|
||||
"futures-util",
|
||||
"getrandom 0.2.7",
|
||||
"gloo-utils",
|
||||
- "indexed_db_futures 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "indexed_db_futures 0.2.3 (git+https://github.com/Hywan/rust-indexed-db?branch=feat-factory-nodejs)",
|
||||
+ "indexed_db_futures",
|
||||
@ -34,14 +33,23 @@ index 2ddfdd0..3fcca5f 100644
|
||||
"matrix-sdk-base",
|
||||
"matrix-sdk-common",
|
||||
diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml
|
||||
index 7f23dfc..c57e29a 100644
|
||||
index 5b0ef4f4..da73979b 100644
|
||||
--- a/crates/matrix-sdk-indexeddb/Cargo.toml
|
||||
+++ b/crates/matrix-sdk-indexeddb/Cargo.toml
|
||||
@@ -30,7 +30,6 @@ js-sys = { version = "0.3.58" }
|
||||
@@ -16,7 +16,7 @@ rustdoc-args = ["--cfg", "docsrs"]
|
||||
[features]
|
||||
default = ["e2e-encryption"]
|
||||
e2e-encryption = ["matrix-sdk-base/e2e-encryption", "dep:matrix-sdk-crypto", "dashmap"]
|
||||
-experimental-nodejs = ["indexed_db_futures_nodejs"]
|
||||
+experimental-nodejs = []
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.57"
|
||||
@@ -26,7 +26,6 @@ dashmap = { version = "5.2.0", optional = true }
|
||||
derive_builder = "0.11.2"
|
||||
gloo-utils = { version = "0.1", features = ["serde"] }
|
||||
indexed_db_futures = "0.2.3"
|
||||
-indexed_db_futures_nodejs = { version = "0.2.3", package = "indexed_db_futures", git = "https://github.com/Hywan/rust-indexed-db", branch = "feat-factory-nodejs", optional = true }
|
||||
js-sys = { version = "0.3.58" }
|
||||
matrix-sdk-base = { version = "0.6.0", path = "../matrix-sdk-base", features = ["js"] }
|
||||
matrix-sdk-crypto = { version = "0.6.0", path = "../matrix-sdk-crypto", features = ["js"], optional = true }
|
||||
matrix-sdk-store-encryption = { version = "0.2.0", path = "../matrix-sdk-store-encryption" }
|
||||
-indexed_db_futures = "0.2.3"
|
||||
indexed_db_futures_nodejs = { package = "indexed_db_futures", git = "https://github.com/Hywan/rust-indexed-db", branch = "feat-factory-nodejs", optional = true }
|
||||
ruma = "0.7.0"
|
||||
serde = "1.0.136"
|
||||
|
||||
@ -209,13 +209,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DENABLE_GTKDOC=OFF"
|
||||
"-DENABLE_MINIBROWSER=OFF"
|
||||
"-DENABLE_QUARTZ_TARGET=ON"
|
||||
"-DENABLE_VIDEO=ON"
|
||||
"-DENABLE_WEBGL=OFF"
|
||||
"-DENABLE_WEB_AUDIO=OFF"
|
||||
"-DENABLE_X11_TARGET=OFF"
|
||||
"-DUSE_APPLE_ICU=OFF"
|
||||
"-DUSE_OPENGL_OR_ES=OFF"
|
||||
"-DUSE_SYSTEM_MALLOC=ON"
|
||||
] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
|
||||
"-DUSE_GTK4=ON"
|
||||
] ++ lib.optionals (!systemdSupport) [
|
||||
|
||||
33
pkgs/development/ocaml-modules/morbig/default.nix
Normal file
33
pkgs/development/ocaml-modules/morbig/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, buildDunePackage, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "morbig";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "colis-anr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fOBaJHHP/Imi9UDLflI52OdKDcmMxpl+NH3pfofmv/o=";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
menhir
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with ocamlPackages; [
|
||||
menhirLib
|
||||
ppx_deriving_yojson
|
||||
visitors
|
||||
yojson
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/colis-anr/${pname}";
|
||||
description = "A static parser for POSIX Shell";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ niols ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +1,37 @@
|
||||
{ buildOctavePackage
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, gfortran
|
||||
, lapack, blas
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
buildOctavePackage rec {
|
||||
pname = "control";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-U/o0RQoHdDhPP3xuiR9gCFb60CKrA30bpc/dH/ozDpg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gnu-octave";
|
||||
repo = "pkg-control";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-isUHovpknIFclspHjAtUxGLkrdxitdWSnQMED9n+R3s=";
|
||||
};
|
||||
|
||||
# Running autoreconfHook inside the src directory fixes a compile issue about
|
||||
# the config.h header for control missing.
|
||||
# This is supposed to be handled by control's top-level Makefile, but does not
|
||||
# appear to be working. This manually forces it instead.
|
||||
preAutoreconf = ''
|
||||
pushd src
|
||||
'';
|
||||
|
||||
postAutoreconf = ''
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -23,7 +39,7 @@ buildOctavePackage rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://octave.sourceforge.io/control/index.html";
|
||||
homepage = "https://gnu-octave.github.io/packages/control/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
description = "Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library";
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.45.0";
|
||||
version = "3.45.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-xhcwEEUAgk1QJjmdAglfLnUlQpG3Pxof4g8c4NuyuPo=";
|
||||
hash = "sha256-dMXHjI4J/Bp4dBpymyzgWZxBi0al3N5eY7QxVoSNdxc=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
{ lib
|
||||
, aiomisc
|
||||
, aiomisc-pytest
|
||||
, aiormq
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pamqp
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -39,11 +40,9 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiomisc-pytest
|
||||
pamqp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiomisc
|
||||
shortuuid
|
||||
];
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiocsv";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "MKuranowski";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cgPD9JdauPIHOdCNxsWInJWytj4niXozFAzJxKn52bE=";
|
||||
hash = "sha256-R9gZqiHYKexXXjbAkKu9YqhZnzC/VAMSDzBYT/mF5v0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib
|
||||
, aiomisc
|
||||
, aiomisc-pytest
|
||||
, caio
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiofile";
|
||||
version = "3.8.0";
|
||||
version = "3.8.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,23 +19,16 @@ buildPythonPackage rec {
|
||||
owner = "mosquito";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PIImQZ1ymazsOg8qmlO91tNYHwXqK/d8AuKPsWYvh0w=";
|
||||
hash = "sha256-jQ97jtYhkqQgQjtHhtlk5JlvkzbFQw3kY6uXuV81ZkQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-asynctest.patch";
|
||||
url = "https://github.com/mosquito/aiofile/commit/9253ca42022f17f630ccfb6811f67876910f8b13.patch";
|
||||
hash = "sha256-yMRfqEbdxApFypEj27v1zTgF/4kuLf5aS/+clo3mfZo=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
caio
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiomisc
|
||||
aiomisc-pytest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@ -63,6 +56,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "File operations with asyncio support";
|
||||
homepage = "https://github.com/mosquito/aiofile";
|
||||
changelog = "https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
48
pkgs/development/python-modules/aiomisc-pytest/default.nix
Normal file
48
pkgs/development/python-modules/aiomisc-pytest/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, aiomisc
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, pytest
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc-pytest";
|
||||
version = "1.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "aiomisc_pytest";
|
||||
inherit version;
|
||||
hash = "sha256-LDeMQbB4wFdgJ95r9/vFN6fmkoXSPq9NRXONXQ3lbdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiomisc
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiomisc_pytest"
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest integration for aiomisc";
|
||||
homepage = "https://github.com/aiokitchen/aiomisc";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -10,29 +10,36 @@
|
||||
, fastapi
|
||||
, fetchPypi
|
||||
, logging-journald
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, raven
|
||||
#, raven-aiohttp
|
||||
, setproctitle
|
||||
, setuptools
|
||||
, uvloop
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomisc";
|
||||
version = "16.3.15";
|
||||
format = "setuptools";
|
||||
version = "17.0.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lHDjsK8ds1ftovY2IAbJwk3jnn4FoDo6f/Nu/MSAhqM=";
|
||||
hash = "sha256-URN9ACnHbQnq7UqfKwhofOdpE/Bjz7WrbdWQikxpVOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorlog
|
||||
logging-journald
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -83,6 +90,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Miscellaneous utils for asyncio";
|
||||
homepage = "https://github.com/aiokitchen/aiomisc";
|
||||
changelog = "https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, aiomisc-pytest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
@ -12,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiormq";
|
||||
version = "6.7.2";
|
||||
version = "6.7.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "mosquito";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ujRw+trXOZaCRsZdkE3WoomOSdYoQkHmtlyFg1mp3Sg=";
|
||||
hash = "sha256-vORo5Kqy+Rg8WCyFU5lyQHS4EALYkycY4XxYhABV/4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -39,7 +40,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiomisc
|
||||
aiomisc-pytest
|
||||
];
|
||||
|
||||
# Tests attempt to connect to a RabbitMQ server
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, aiomisc
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
@ -22,6 +23,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiomisc
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "devolo-plc-api";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "2Fake";
|
||||
repo = "devolo_plc_api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ua6XxFmvF2EDtCZTeVHGRfwNAMjX3p5s4Jo5ylutYqY=";
|
||||
hash = "sha256-ika0mypHo7a8GCa2eNhOLIhMZ2ASwJOxV4mmAzvJm0E=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.19.0";
|
||||
version = "2.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2EsqTVf65OCvT1i0whgCSvKGGHuHHE27bEg1S4kb+a8=";
|
||||
hash = "sha256-l/ENHQVW35pGuSkLsFDM5BRCAoD6KTmJgs+djuR6SM0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.19.1";
|
||||
version = "1.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xI9CFp3esSxOsOsO5mVWUkMROpuX2QjzKVhKCBUpDhc=";
|
||||
hash = "sha256-r6HulAsKLJvL6jS/cKiMgdbYHeiChje4a7PCz6qA2yM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "0.27.2";
|
||||
version = "0.27.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eHaYOJB/Ujadq71Ow3aTgiahYoiqoHwtNXr68nJUqGc=";
|
||||
hash = "sha256-E6Y4PdxwR1V4j48bbbuV6DtgAtXRyEMa9ipA1URL2Ac=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,30 +1,29 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.5)
|
||||
CFPropertyList (3.0.6)
|
||||
rexml
|
||||
activesupport (6.1.6)
|
||||
activesupport (7.0.4.3)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
addressable (2.8.4)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
algoliasearch (1.27.5)
|
||||
httpclient (~> 2.8, >= 2.8.3)
|
||||
json (>= 1.5.1)
|
||||
atomos (0.1.3)
|
||||
claide (1.1.0)
|
||||
cocoapods (1.11.3)
|
||||
cocoapods (1.12.0)
|
||||
addressable (~> 2.8)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.11.3)
|
||||
cocoapods-core (= 1.12.0)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.4.0, < 2.0)
|
||||
cocoapods-downloader (>= 1.6.0, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.4.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.6.0, < 2.0)
|
||||
cocoapods-try (>= 1.1.0, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
escape (~> 0.0.4)
|
||||
@ -32,10 +31,10 @@ GEM
|
||||
gh_inspector (~> 1.0)
|
||||
molinillo (~> 0.8.0)
|
||||
nap (~> 1.0)
|
||||
ruby-macho (>= 1.0, < 3.0)
|
||||
ruby-macho (>= 2.3.0, < 3.0)
|
||||
xcodeproj (>= 1.21.0, < 2.0)
|
||||
cocoapods-core (1.11.3)
|
||||
activesupport (>= 5.0, < 7)
|
||||
cocoapods-core (1.12.0)
|
||||
activesupport (>= 5.0, < 8)
|
||||
addressable (~> 2.8)
|
||||
algoliasearch (~> 1.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
@ -54,19 +53,19 @@ GEM
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.2.0)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.10)
|
||||
concurrent-ruby (1.2.2)
|
||||
escape (0.0.4)
|
||||
ethon (0.15.0)
|
||||
ethon (0.16.0)
|
||||
ffi (>= 1.15.0)
|
||||
ffi (1.15.5)
|
||||
fourflusher (2.3.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.10.0)
|
||||
i18n (1.12.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.6.2)
|
||||
minitest (5.15.0)
|
||||
json (2.6.3)
|
||||
minitest (5.18.0)
|
||||
molinillo (0.8.0)
|
||||
nanaimo (0.3.0)
|
||||
nap (1.1.0)
|
||||
@ -76,16 +75,15 @@ GEM
|
||||
ruby-macho (2.5.1)
|
||||
typhoeus (1.4.0)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (2.0.4)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
xcodeproj (1.21.0)
|
||||
xcodeproj (1.22.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
nanaimo (~> 0.3.0)
|
||||
rexml (~> 3.2.4)
|
||||
zeitwerk (2.5.4)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@ -94,4 +92,4 @@ DEPENDENCIES
|
||||
cocoapods (>= 1.7.0.beta.1)
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.20
|
||||
2.3.20
|
||||
|
||||
@ -1,30 +1,29 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.5)
|
||||
CFPropertyList (3.0.6)
|
||||
rexml
|
||||
activesupport (6.1.6)
|
||||
activesupport (7.0.4.3)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
addressable (2.8.4)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
algoliasearch (1.27.5)
|
||||
httpclient (~> 2.8, >= 2.8.3)
|
||||
json (>= 1.5.1)
|
||||
atomos (0.1.3)
|
||||
claide (1.1.0)
|
||||
cocoapods (1.11.3)
|
||||
cocoapods (1.12.0)
|
||||
addressable (~> 2.8)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.11.3)
|
||||
cocoapods-core (= 1.12.0)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.4.0, < 2.0)
|
||||
cocoapods-downloader (>= 1.6.0, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.4.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.6.0, < 2.0)
|
||||
cocoapods-try (>= 1.1.0, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
escape (~> 0.0.4)
|
||||
@ -32,10 +31,10 @@ GEM
|
||||
gh_inspector (~> 1.0)
|
||||
molinillo (~> 0.8.0)
|
||||
nap (~> 1.0)
|
||||
ruby-macho (>= 1.0, < 3.0)
|
||||
ruby-macho (>= 2.3.0, < 3.0)
|
||||
xcodeproj (>= 1.21.0, < 2.0)
|
||||
cocoapods-core (1.11.3)
|
||||
activesupport (>= 5.0, < 7)
|
||||
cocoapods-core (1.12.0)
|
||||
activesupport (>= 5.0, < 8)
|
||||
addressable (~> 2.8)
|
||||
algoliasearch (~> 1.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
@ -54,19 +53,19 @@ GEM
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.2.0)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.10)
|
||||
concurrent-ruby (1.2.2)
|
||||
escape (0.0.4)
|
||||
ethon (0.15.0)
|
||||
ethon (0.16.0)
|
||||
ffi (>= 1.15.0)
|
||||
ffi (1.15.5)
|
||||
fourflusher (2.3.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.10.0)
|
||||
i18n (1.12.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.6.2)
|
||||
minitest (5.15.0)
|
||||
json (2.6.3)
|
||||
minitest (5.18.0)
|
||||
molinillo (0.8.0)
|
||||
nanaimo (0.3.0)
|
||||
nap (1.1.0)
|
||||
@ -76,16 +75,15 @@ GEM
|
||||
ruby-macho (2.5.1)
|
||||
typhoeus (1.4.0)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (2.0.4)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
xcodeproj (1.21.0)
|
||||
xcodeproj (1.22.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
nanaimo (~> 0.3.0)
|
||||
rexml (~> 3.2.4)
|
||||
zeitwerk (2.5.4)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@ -94,4 +92,4 @@ DEPENDENCIES
|
||||
cocoapods
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.20
|
||||
2.3.20
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw";
|
||||
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.6";
|
||||
version = "7.0.4.3";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -16,10 +16,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.4";
|
||||
};
|
||||
algoliasearch = {
|
||||
dependencies = ["httpclient" "json"];
|
||||
@ -48,10 +48,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
|
||||
sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
};
|
||||
claide = {
|
||||
groups = ["default"];
|
||||
@ -69,10 +69,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cix57b2si8lc1m15mzg3mr1kmvn5sq0cy01vqwlfvvirrkf3ky3";
|
||||
sha256 = "071kl1d0wi0v3w4gqjh9hzf8jclk59m2xn5dynmr0waammmm1yhw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.3";
|
||||
version = "1.12.0";
|
||||
};
|
||||
cocoapods-core = {
|
||||
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
|
||||
@ -80,10 +80,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lqcq7pk3znc9par217h4hv8g70w25m2a2llgyayp30dlgdj45iy";
|
||||
sha256 = "0gz84agvxbcp7ngkixkgyj9dcjd3q4q8qffx0b75kzg8p31ywl5b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.3";
|
||||
version = "1.12.0";
|
||||
};
|
||||
cocoapods-deintegrate = {
|
||||
groups = ["default"];
|
||||
@ -162,10 +162,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.10";
|
||||
version = "1.2.2";
|
||||
};
|
||||
escape = {
|
||||
groups = ["default"];
|
||||
@ -183,10 +183,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
|
||||
sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
@ -244,30 +244,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
|
||||
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.12.0";
|
||||
};
|
||||
json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
|
||||
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
|
||||
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.15.0";
|
||||
version = "5.18.0";
|
||||
};
|
||||
molinillo = {
|
||||
groups = ["default"];
|
||||
@ -356,10 +356,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
|
||||
sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.4";
|
||||
version = "2.0.6";
|
||||
};
|
||||
xcodeproj = {
|
||||
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
|
||||
@ -367,19 +367,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
|
||||
sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.21.0";
|
||||
};
|
||||
zeitwerk = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.4";
|
||||
version = "1.22.0";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw";
|
||||
sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.6";
|
||||
version = "7.0.4.3";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -16,10 +16,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
|
||||
sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.4";
|
||||
};
|
||||
algoliasearch = {
|
||||
dependencies = ["httpclient" "json"];
|
||||
@ -46,10 +46,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
|
||||
sha256 = "1a36zn77yyibqsfpka0i8vgf3yv98ic2b9wwlbc29566y8wpa2bq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
};
|
||||
claide = {
|
||||
groups = ["default"];
|
||||
@ -67,10 +67,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cix57b2si8lc1m15mzg3mr1kmvn5sq0cy01vqwlfvvirrkf3ky3";
|
||||
sha256 = "071kl1d0wi0v3w4gqjh9hzf8jclk59m2xn5dynmr0waammmm1yhw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.3";
|
||||
version = "1.12.0";
|
||||
};
|
||||
cocoapods-core = {
|
||||
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
|
||||
@ -78,10 +78,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lqcq7pk3znc9par217h4hv8g70w25m2a2llgyayp30dlgdj45iy";
|
||||
sha256 = "0gz84agvxbcp7ngkixkgyj9dcjd3q4q8qffx0b75kzg8p31ywl5b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.3";
|
||||
version = "1.12.0";
|
||||
};
|
||||
cocoapods-deintegrate = {
|
||||
groups = ["default"];
|
||||
@ -156,10 +156,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.10";
|
||||
version = "1.2.2";
|
||||
};
|
||||
escape = {
|
||||
source = {
|
||||
@ -175,10 +175,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
|
||||
sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.15.0";
|
||||
version = "0.16.0";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
@ -232,30 +232,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
|
||||
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.0";
|
||||
version = "1.12.0";
|
||||
};
|
||||
json = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
|
||||
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
|
||||
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.15.0";
|
||||
version = "5.18.0";
|
||||
};
|
||||
molinillo = {
|
||||
groups = ["default"];
|
||||
@ -340,10 +340,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
|
||||
sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.4";
|
||||
version = "2.0.6";
|
||||
};
|
||||
xcodeproj = {
|
||||
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
|
||||
@ -351,19 +351,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4";
|
||||
sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.21.0";
|
||||
};
|
||||
zeitwerk = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.4";
|
||||
version = "1.22.0";
|
||||
};
|
||||
}
|
||||
|
||||
26
pkgs/development/tools/dec-decode/default.nix
Normal file
26
pkgs/development/tools/dec-decode/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dec-decode";
|
||||
version = "unstable-2022-12-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sammiq";
|
||||
repo = pname;
|
||||
rev = "6ee103c";
|
||||
hash = "sha256-vOYKVl00oaXwp77pRLqUPnXQT5QuJfqnGGkQVBMq5W0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zGWRzw1KUmifIsTudlgoKCR3+K0FLehHRSB3lNX+OWY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nintendo Wii iso.dec decoder";
|
||||
homepage = "https://github.com/sammiq/dec-decode";
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ hughobrien ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "skopeo";
|
||||
version = "1.11.2";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "containers";
|
||||
repo = "skopeo";
|
||||
hash = "sha256-+FYq6Far8zFlIsaPtt/1mvfjMHb0gc4rat+M+aK+XW4=";
|
||||
hash = "sha256-a4uM2WjDhjz4zTiM2HWoDHQQ9aT38HV9GNUJAJmZR+w=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -96,6 +96,14 @@ let
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Don't allow enabling content addressed conversion as `nodejs`
|
||||
# checksums it's image before conversion happens and image loading
|
||||
# breaks:
|
||||
# $ nix build -f. nodejs --arg config '{ contentAddressedByDefault = true; }'
|
||||
# $ ./result/bin/node
|
||||
# Check failed: VerifyChecksum(blob).
|
||||
__contentAddressed = false;
|
||||
|
||||
passthru.interpreterName = "nodejs";
|
||||
|
||||
passthru.pkgs = callPackage ../../node-packages/default.nix {
|
||||
|
||||
@ -29,11 +29,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openttd";
|
||||
version = "13.0";
|
||||
version = "13.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
|
||||
hash = "sha256-M5344OCCcIfIOv54+O/GpzsKPYqVCgtTE3zm6KrXq2c=";
|
||||
hash = "sha256-Xt8i03A1I4KF72cql9WeZCgL66sj5YR4CDTM1r4KWLs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "8.2.1";
|
||||
version = "8.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QJNXmSM8xIw8gN3rB1mGT7GRf1nx0Y0Z+8yf0gjddBo=";
|
||||
hash = "sha256-31lXYqve1vYRwfNJWT1auWti8vHUqsqEtMr2dgPokLU=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-lNb/RPL+MM2NeAVzGWfkrYJz+z8Lb9jPRmQP9Ht5Meo=";
|
||||
vendorHash = "sha256-FxG9AQNVBS2T43VB5u8GG2GgGwjf2pGLH9jsBMOK2Fw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@ -52,8 +52,8 @@ buildGoModule rec {
|
||||
];
|
||||
preBuild = let
|
||||
cliConfigToml = fetchurl {
|
||||
url = "https://web.archive.org/web/20230308181550/https://developer.fastly.com/api/internal/cli-config";
|
||||
hash = "sha256-Y2KBTiUQlugKjfhOY+8W7/IUSjgeRVc2NgmL+nhb6aQ=";
|
||||
url = "https://web.archive.org/web/20230412222811/https://developer.fastly.com/api/internal/cli-config";
|
||||
hash = "sha256-NACjeBGOvBL6kUBZtSx4ChZgn7V69f4K2yyDCwTZsbU=";
|
||||
};
|
||||
in ''
|
||||
cp ${cliConfigToml} ./pkg/config/config.toml
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ fetchFromGitHub
|
||||
, json_c
|
||||
, keyutils
|
||||
, lib
|
||||
, meson
|
||||
, ninja
|
||||
@ -8,12 +9,13 @@
|
||||
, pkg-config
|
||||
, python3
|
||||
, stdenv
|
||||
, swig
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libnvme";
|
||||
version = "1.2";
|
||||
version = "1.4";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "linux-nvme";
|
||||
repo = "libnvme";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U9Fj3OcBe32C0PKhI05eF/6jikHAvdyvXH16IY0rWxI=";
|
||||
sha256 = "sha256-8DlEQ4LH6UhIHr0znJGqkuCosLHqA6hkJjmiCawNE1k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -36,9 +38,11 @@ stdenv.mkDerivation rec {
|
||||
perl # for kernel-doc
|
||||
pkg-config
|
||||
python3
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
keyutils
|
||||
json_c
|
||||
openssl
|
||||
systemd
|
||||
|
||||
@ -127,7 +127,7 @@ let
|
||||
description = "X.org driver and kernel module for NVIDIA graphics cards";
|
||||
license = licenses.unfreeRedistributable;
|
||||
platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ];
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
maintainers = with maintainers; [ jonringer kiskae ];
|
||||
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
|
||||
inherit broken;
|
||||
};
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvme-cli";
|
||||
version = "2.2.1";
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-nvme";
|
||||
repo = "nvme-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-okYtGiKUPNO31ntD9j5iAgdcnS5OQ/g1QAY+svhga4c=";
|
||||
hash = "sha256-vnhvVVfEDnmEIdIkfTRoiLB7dZ1rJV3U4PmUUoaxTUs=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -309,6 +309,7 @@ else let
|
||||
hostSuffix = lib.optionalString
|
||||
(stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
|
||||
"-${stdenv.hostPlatform.config}";
|
||||
|
||||
# Disambiguate statically built packages. This was originally
|
||||
# introduce as a means to prevent nix-env to get confused between
|
||||
# nix and nixStatic. This should be also achieved by moving the
|
||||
@ -319,7 +320,10 @@ else let
|
||||
lib.strings.sanitizeDerivationName (
|
||||
if attrs ? name
|
||||
then attrs.name + hostSuffix
|
||||
else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
|
||||
else
|
||||
# we cannot coerce null to a string below
|
||||
assert lib.assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null.";
|
||||
"${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
|
||||
);
|
||||
}) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // {
|
||||
builder = attrs.realBuilder or stdenv.shell;
|
||||
|
||||
707
pkgs/tools/security/ripasso/Cargo.lock
generated
707
pkgs/tools/security/ripasso/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,55 +0,0 @@
|
||||
diff --git a/cursive/Cargo.toml b/cursive/Cargo.toml
|
||||
index 8cc0c1e..815c170 100644
|
||||
--- a/cursive/Cargo.toml
|
||||
+++ b/cursive/Cargo.toml
|
||||
@@ -20,8 +20,9 @@ gettext = "0.4.0"
|
||||
lazy_static = "1.4.0"
|
||||
toml = "0.5.9"
|
||||
term_size = "0.3.2"
|
||||
-wl-clipboard-rs = "0.7.0"
|
||||
hex = "0.4.3"
|
||||
+[target.'cfg(target_os = "linux")'.dependencies]
|
||||
+wl-clipboard-rs = "0.7.0"
|
||||
|
||||
[dependencies.config]
|
||||
version = "0.11.0"
|
||||
diff --git a/cursive/src/helpers.rs b/cursive/src/helpers.rs
|
||||
index 7c2f733..9d63760 100644
|
||||
--- a/cursive/src/helpers.rs
|
||||
+++ b/cursive/src/helpers.rs
|
||||
@@ -23,6 +23,7 @@ use cursive::{
|
||||
};
|
||||
use pass::Result;
|
||||
use ripasso::{crypto::CryptoImpl, pass};
|
||||
+#[cfg(target_os = "linux")]
|
||||
use wl_clipboard_rs::copy::{MimeType, Options, Source};
|
||||
|
||||
/// Displays an error in a cursive dialog
|
||||
@@ -48,7 +49,8 @@ pub fn errorbox(ui: &mut Cursive, err: &pass::Error) {
|
||||
|
||||
/// Copies content to the clipboard.
|
||||
/// It first tries to copy to a wayland clipboard, and if that's not availible due to that the
|
||||
-/// user runs x11/mac/windows we instead try the more generic clipboard crate.
|
||||
+/// user runs x11 we instead try the more generic clipboard crate.
|
||||
+#[cfg(target_os = "linux")]
|
||||
pub fn set_clipboard(content: String) -> Result<()> {
|
||||
let opts = Options::new();
|
||||
let result = opts.copy(
|
||||
@@ -62,6 +64,17 @@ pub fn set_clipboard(content: String) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
+/// Copies content to the clipboard.
|
||||
+/// It first tries to copy to a wayland clipboard, and if that's not availible due to that the
|
||||
+/// user runs mac/windows we instead try the more generic clipboard crate.
|
||||
+#[cfg(not(target_os = "linux"))]
|
||||
+pub fn set_clipboard(content: String) -> Result<()> {
|
||||
+ let mut ctx = clipboard::ClipboardContext::new()?;
|
||||
+ ctx.set_contents(content)?;
|
||||
+
|
||||
+ Ok(())
|
||||
+}
|
||||
+
|
||||
pub fn get_value_from_input(s: &mut Cursive, input_name: &str) -> Option<std::rc::Rc<String>> {
|
||||
let mut password = None;
|
||||
s.call_on_name(input_name, |e: &mut EditView| {
|
||||
@ -1,21 +1,41 @@
|
||||
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, python3, openssl, libgpg-error, gpgme, xorg, nettle, llvmPackages, clang, AppKit, Security, installShellFiles }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, python3
|
||||
, openssl
|
||||
, libgpg-error
|
||||
, gpgme
|
||||
, xorg
|
||||
, nettle
|
||||
, llvmPackages
|
||||
, clang
|
||||
, AppKit
|
||||
, Security
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
with rustPlatform;
|
||||
buildRustPackage rec {
|
||||
version = "0.6.2";
|
||||
version = "0.6.4";
|
||||
pname = "ripasso-cursive";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cortex";
|
||||
repo = "ripasso";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-OKFgBfm4d9IqSJFjg+J1XdsgQrfuIaoRIhVJQeZ+558=";
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-9wBaFq2KVfLTd1j8ZPoUlmZJDW2UhvGBAaCGX+qg92s=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-tests.patch ./build-on-macos.patch ];
|
||||
patches = [
|
||||
./fix-tests.patch
|
||||
];
|
||||
|
||||
# Needed so bindgen can find libclang.so
|
||||
LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
|
||||
cargoPatches = [
|
||||
./fix-build.patch
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
@ -26,10 +46,25 @@ buildRustPackage rec {
|
||||
|
||||
cargoBuildFlags = [ "-p ripasso-cursive" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config gpgme python3 installShellFiles clang ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gpgme
|
||||
python3
|
||||
installShellFiles
|
||||
clang
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl libgpg-error gpgme xorg.libxcb nettle
|
||||
] ++ lib.optionals stdenv.isDarwin [ AppKit Security ];
|
||||
openssl
|
||||
libgpg-error
|
||||
gpgme
|
||||
xorg.libxcb
|
||||
nettle
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
Security
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
|
||||
40
pkgs/tools/security/ripasso/fix-build.patch
Normal file
40
pkgs/tools/security/ripasso/fix-build.patch
Normal file
@ -0,0 +1,40 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 8464bf70..659e66c0 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2702,7 +2702,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"base64 0.21.0",
|
||||
@@ -2730,7 +2730,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso-cursive"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"cli-clipboard",
|
||||
@@ -2753,7 +2753,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso-gtk"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"clipboard",
|
||||
"gdk",
|
||||
@@ -2765,7 +2765,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ripasso-qt"
|
||||
-version = "0.6.3"
|
||||
+version = "0.6.4"
|
||||
dependencies = [
|
||||
"clipboard",
|
||||
"qml",
|
||||
@ -514,6 +514,8 @@ with pkgs;
|
||||
|
||||
deadnix = callPackage ../development/tools/deadnix { };
|
||||
|
||||
dec-decode = callPackage ../development/tools/dec-decode { };
|
||||
|
||||
dsq = callPackage ../tools/misc/dsq { };
|
||||
|
||||
dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { };
|
||||
@ -31362,6 +31364,8 @@ with pkgs;
|
||||
|
||||
kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };
|
||||
|
||||
kickoff = callPackage ../applications/misc/kickoff { };
|
||||
|
||||
klayout = libsForQt5.callPackage ../applications/misc/klayout { };
|
||||
|
||||
klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; {
|
||||
|
||||
@ -1042,6 +1042,8 @@ let
|
||||
|
||||
mmap = callPackage ../development/ocaml-modules/mmap { };
|
||||
|
||||
morbig = callPackage ../development/ocaml-modules/morbig { };
|
||||
|
||||
mparser = callPackage ../development/ocaml-modules/mparser { };
|
||||
|
||||
mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { };
|
||||
|
||||
@ -258,6 +258,8 @@ self: super: with self; {
|
||||
|
||||
aiomisc = callPackage ../development/python-modules/aiomisc { };
|
||||
|
||||
aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { };
|
||||
|
||||
aiomodernforms = callPackage ../development/python-modules/aiomodernforms { };
|
||||
|
||||
aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user