gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2022-08-31 06:28:01 +00:00
committed by GitHub
parent c13727fa82 fea2848958
commit 6c7beefcd1
46 changed files with 181 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/mympd/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "mympd";
version = "9.5.2";
version = "9.5.3";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${version}";
sha256 = "sha256-WmGaZXITvrp7ml7s7FPyp3Q3072KU/P6UombBj99fX0=";
sha256 = "sha256-0plbOBTrEOjfVbyfrQ8mNByJb6XygIPTrwGfY6+0DHo=";
};
nativeBuildInputs = [
pkgs/applications/networking/cluster/arkade/default.nix
+3 -3
View File
@@ -7,20 +7,20 @@
buildGoModule rec {
pname = "arkade";
version = "0.8.36";
version = "0.8.38";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
sha256 = "sha256-+666KfOK2yxkADw+EvKlXAAsz2Aw+EmRXGAqNMfBsj8=";
sha256 = "sha256-8C7aQCQ6kqHCGSktYS3djTlEuPyRnzb9LrXkqgfzDyY=";
};
CGO_ENABLED = 0;
nativeBuildInputs = [ installShellFiles ];
vendorSha256 = "sha256-6EnhO4zYYdsTKvNQApZxXo8x6oFKsmuMvOI3zPHAQLs=";
vendorSha256 = "sha256-ok8NuqVFZtzjSLpgxQI03ISojfKdHPHWyikqwtceMlo=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [
pkgs/development/ocaml-modules/angstrom/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ppx_let ];
buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ bigstringaf result ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
homepage = "https://github.com/inhabitedtype/angstrom";
pkgs/development/ocaml-modules/base64/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ buildDunePackage rec {
};
# otherwise fmt breaks evaluation
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest bos rresult ];
meta = {
pkgs/development/ocaml-modules/bigarray-overlap/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl
{ lib, buildDunePackage, ocaml, fetchurl
, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config
}:
@@ -20,7 +20,7 @@ buildDunePackage rec {
nativeBuildInputs = [ findlib pkg-config ];
checkInputs = [ alcotest astring fpath bos ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
homepage = "https://github.com/dinosaure/overlap";
pkgs/development/ocaml-modules/bigstringaf/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ buildDunePackage rec {
nativeBuildInputs = [ pkg-config ];
checkInputs = [ alcotest ];
propagatedBuildInputs = [ bigarray-compat ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "Bigstring intrinsics and fast blits based on memcpy/memmove";
pkgs/development/ocaml-modules/callipyge/default.nix
+2 -2
View File
@@ -23,8 +23,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt eqaf ];
# alcotest isn't available for OCaml < 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
# alcotest isn't available for OCaml < 4.08 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ];
meta = {
pkgs/development/ocaml-modules/caqti/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, buildDunePackage
{ lib, fetchFromGitHub, buildDunePackage, ocaml
, cppo, logs, ptime, uri, bigstringaf
, re, cmdliner, alcotest }:
@@ -20,7 +20,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ logs ptime uri bigstringaf ];
checkInputs = [ re cmdliner alcotest ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "Unified interface to relational database libraries";
pkgs/development/ocaml-modules/checkseum/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, dune-configurator, pkg-config
{ lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config
, bigarray-compat, optint
, fmt, rresult, bos, fpath, astring, alcotest
, withFreestanding ? false
@@ -36,7 +36,7 @@ buildDunePackage rec {
rresult
];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "ADLER-32 and CRC32C Cyclic Redundancy Check";
pkgs/development/ocaml-modules/cow/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage, alcotest
{ lib, fetchurl, buildDunePackage, ocaml, alcotest
, uri, xmlm, omd, ezjsonm }:
buildDunePackage rec {
@@ -15,7 +15,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ xmlm uri ezjsonm omd ];
checkInputs = [ alcotest ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
description = "Caml on the Web";
pkgs/development/ocaml-modules/cstruct/default.nix
+2 -2
View File
@@ -15,8 +15,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ bigarray-compat ];
# alcotest isn't available for OCaml < 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
# alcotest isn't available for OCaml < 4.08 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ];
meta = {
pkgs/development/ocaml-modules/cstruct/sexp.nix
+2 -2
View File
@@ -10,8 +10,8 @@ buildDunePackage rec {
minimumOCamlVersion = "4.03";
# alcotest is only available on OCaml >= 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
# alcotest is only available on OCaml >= 4.08 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ];
propagatedBuildInputs = [ cstruct sexplib ];
pkgs/development/ocaml-modules/decompress/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, buildDunePackage, ocaml
, checkseum, bigarray-compat, optint, cmdliner
, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
}:
@@ -19,7 +19,7 @@ buildDunePackage rec {
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ optint bigarray-compat checkseum ];
checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "Pure OCaml implementation of Zlib";
pkgs/development/ocaml-modules/dispatch/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
inherit (src.meta) homepage;
pkgs/development/ocaml-modules/domain-name/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
homepage = "https://github.com/hannesm/domain-name";
pkgs/development/ocaml-modules/duration/default.nix
+1 -1
View File
@@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "sha256-rRT7daWm9z//fvFyEXiSXuVVzw8jsj46sykYS8DBzmk=";
};
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ];
meta = {
pkgs/development/ocaml-modules/emile/default.nix
+3 -3
View File
@@ -25,9 +25,9 @@ buildDunePackage rec {
];
# technically emile is available for ocaml >= 4.03, but alcotest
# and angstrom (fmt) are only available for >= 4.05. Disabling
# tests for < 4.05 at least improves the error message
doCheck = lib.versionAtLeast ocaml.version "4.05";
# and angstrom (fmt) are only available for >= 4.08. Disabling
# tests for < 4.08 at least improves the error message
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ];
meta = with lib; {
pkgs/development/ocaml-modules/faraday/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
propagatedBuildInputs = [ bigstringaf ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "Serialization library built for speed and memory efficiency";
pkgs/development/ocaml-modules/ff/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitLab, buildDunePackage, zarith, alcotest }:
{ lib, fetchFromGitLab, buildDunePackage, ocaml, zarith, alcotest }:
buildDunePackage rec {
pname = "ff";
@@ -21,7 +21,7 @@ buildDunePackage rec {
alcotest
];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
homepage = "https://gitlab.com/dannywillems/ocaml-ff";
pkgs/development/ocaml-modules/fmt/default.nix
+4 -5
View File
@@ -1,21 +1,20 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }:
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }:
if lib.versionOlder ocaml.version "4.05"
if lib.versionOlder ocaml.version "4.08"
then throw "fmt is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
version = "0.8.9";
version = "0.9.0";
pname = "ocaml${ocaml.version}-fmt";
src = fetchurl {
url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";
sha256 = "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk";
sha256 = "sha256-8fsggFoi3XWhN9cnBKNw53ic9r32OUjmgX0cImwUEmE=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
buildInputs = [ cmdliner topkg ];
propagatedBuildInputs = [ seq stdlib-shims ];
strictDeps = true;
pkgs/development/ocaml-modules/gmap/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "Heterogenous maps over a GADT";
pkgs/development/ocaml-modules/graphql/parser.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt, menhir, re }:
{ lib, buildDunePackage, fetchurl, alcotest, fmt, menhir, re }:
buildDunePackage rec {
pname = "graphql_parser";
version = "0.14.0";
minimalOCamlVersion = "4.05";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";
@@ -16,7 +16,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
doCheck = true;
meta = {
homepage = "https://github.com/andreas/ocaml-graphql-server";
pkgs/development/ocaml-modules/h2/default.nix
+1 -1
View File
@@ -43,7 +43,7 @@ buildDunePackage rec {
];
# Tests fail with 4.06
doCheck = lib.versionAtLeast ocaml.version "4.07";
doCheck = lib.versionAtLeast ocaml.version "4.08";
preCheck = ''
ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case
'';
pkgs/development/ocaml-modules/httpaf/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml
, angstrom, faraday, alcotest
}:
@@ -17,7 +17,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
propagatedBuildInputs = [ angstrom faraday ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "A high-performance, memory-efficient, and scalable web server for OCaml";
pkgs/development/ocaml-modules/imagelib/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, buildDunePackage, ocaml
, decompress, stdlib-shims, alcotest
}:
@@ -16,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ decompress stdlib-shims ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ];
meta = {
pkgs/development/ocaml-modules/logs/default.nix
+4 -2
View File
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild
, topkg, result, lwt, cmdliner, fmt
, fmtSupport ? lib.versionAtLeast ocaml.version "4.08"
, js_of_ocaml
, jsooSupport ? true
}:
@@ -22,13 +23,14 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
buildInputs = [ fmt cmdliner lwt topkg ]
buildInputs = [ cmdliner lwt topkg ]
++ lib.optional fmtSupport fmt
++ lib.optional jsooSupport js_of_ocaml;
propagatedBuildInputs = [ result ];
strictDeps = true;
buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}";
buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport} --with-fmt ${lib.boolToString fmtSupport}";
inherit (topkg) installPhase;
pkgs/development/ocaml-modules/luv/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl
{ lib, buildDunePackage, ocaml, fetchurl
, ctypes, result
, alcotest
, file
@@ -23,7 +23,7 @@ buildDunePackage rec {
nativeBuildInputs = [ file ];
propagatedBuildInputs = [ ctypes result ];
checkInputs = [ alcotest ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
homepage = "https://github.com/aantron/luv";
pkgs/development/ocaml-modules/ppx_blob/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ buildDunePackage rec {
checkInputs = [ alcotest ];
propagatedBuildInputs = [ ppxlib ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
homepage = "https://github.com/johnwhitington/ppx_blob";
pkgs/development/ocaml-modules/rpclib/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, buildDunePackage
{ lib, fetchurl, buildDunePackage, ocaml
, alcotest
, base64, cmdliner, rresult, xmlm, yojson
}:
@@ -18,7 +18,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ base64 rresult xmlm ];
checkInputs = [ alcotest ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
homepage = "https://github.com/mirage/ocaml-rpc";
pkgs/development/ocaml-modules/ssl/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ buildDunePackage rec {
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ openssl ];
doCheck = lib.versionAtLeast ocaml.version "4.06";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest ];
preCheck = ''
mkdir -p _build/default/tests/
pkgs/development/ocaml-modules/terminal/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ stdlib-shims uutf uucp ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ alcotest fmt ];
meta = with lib; {
pkgs/development/ocaml-modules/terminal_size/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl, alcotest }:
{ lib, buildDunePackage, ocaml, fetchurl, alcotest }:
buildDunePackage rec {
pname = "terminal_size";
@@ -12,7 +12,7 @@ buildDunePackage rec {
};
checkInputs = [ alcotest ];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
description = "Get the dimensions of the terminal";
pkgs/development/ocaml-modules/uecc/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchFromGitLab, buildDunePackage, bigstring, alcotest, cstruct, hex }:
{ lib, fetchFromGitLab, buildDunePackage, ocaml, bigstring, alcotest, cstruct, hex }:
buildDunePackage rec {
pname = "uecc";
@@ -23,7 +23,7 @@ buildDunePackage rec {
hex
];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "Bindings for ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors";
pkgs/development/ocaml-modules/yuscii/default.nix
+4 -1
View File
@@ -1,5 +1,6 @@
{ alcotest
, buildDunePackage
, ocaml
, fetchzip
, gcc
, fmt
@@ -11,6 +12,8 @@ buildDunePackage rec {
pname = "yuscii";
version = "0.3.0";
minimalOCamlVersion = "4.03";
src = fetchzip {
url = "https://github.com/mirage/yuscii/releases/download/v${version}/yuscii-v${version}.tbz";
sha256 = "0idywlkw0fbakrxv65swnr5bj7f2vns9kpay7q03gzlv82p670hy";
@@ -24,7 +27,7 @@ buildDunePackage rec {
fmt
uutf
];
doCheck = true;
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
description = "A simple mapper between UTF-7 to Unicode according RFC2152";
pkgs/development/python-modules/pylibmc/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pylibmc";
version = "1.6.2";
version = "1.6.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA=";
hash = "sha256-7vpGEVU3q61l++LgMqzRs0Y9m/njNa9LCRbfTk0yBuA=";
};
buildInputs = [
pkgs/development/python-modules/sorl_thumbnail/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "sorl-thumbnail";
version = "12.8.0";
version = "12.9.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-7io8nwuInlmRk4PTeB8TF9ycSSf7RLIvsUN/b+cFS5Y=";
sha256 = "sha256-DLwvUhUufyJm48LLSuXYOv0ulv1eHELlZnNiuqo9LbM=";
};
nativeBuildInputs = [ setuptools-scm ];
pkgs/development/python-modules/telethon/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "telethon";
version = "1.24.0";
version = "1.25.0";
src = fetchPypi {
inherit version;
pname = "Telethon";
sha256 = "818cb61281ed3f75ba4da9b68cb69486bed9474d2db4e0aa16e482053117452c";
sha256 = "sha256-Z22XuSbm0w2+0x1sbmYRzeyfyCdZeFzqVcR3C3RhQpA=";
};
patchPhase = ''
pkgs/development/python-modules/types-redis/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.3.18";
version = "4.3.19";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ImBTLBV9T2T24mbeZ7CqoZec+5aeQJoWRF7Gl2xKHeY=";
sha256 = "sha256-yIH/uUvUfcoh7VAzKFRKVrsxWFFXXuuyf7Nxv/c1hEo=";
};
# Module doesn't have tests
pkgs/development/tools/misc/cvise/default.nix
+7 -9
View File
@@ -3,6 +3,7 @@
, fetchFromGitHub
, bash
, cmake
, colordiff
, flex
, libclang
, llvm
@@ -15,13 +16,13 @@
buildPythonApplication rec {
pname = "cvise";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "marxin";
repo = "cvise";
rev = "v${version}";
sha256 = "0cfzikkhp91hjgxjk3izzczb8d9p8v9zsfyk6iklk92n5qf1aakq";
rev = "refs/tags/v${version}";
sha256 = "sha256-Nt6Zs3FxO8Ti+ikVPVaMCejzBIuUxrzG4VLhChCSJQw=";
};
patches = [
@@ -34,8 +35,9 @@ buildPythonApplication rec {
substituteInPlace cvise.py \
--replace "#!/bin/bash" "#!${bash}/bin/bash"
substituteInPlace setup.cfg \
--replace "--flake8" ""
substituteInPlace cvise/utils/testing.py \
--replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \
--replace "'colordiff'" "'${colordiff}/bin/colordiff'"
'';
nativeBuildInputs = [
@@ -62,10 +64,6 @@ buildPythonApplication rec {
unifdef
];
preCheck = ''
patchShebangs cvise.py
'';
disabledTests = [
# Needs gcc, fails when run noninteractively (without tty).
"test_simple_reduction"
pkgs/development/tools/oh-my-posh/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "8.36.1";
version = "8.36.4";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/l2tekp3kke4soyBOmNEqh0Jxbpk2qK4vYrOfc+pw1o=";
sha256 = "sha256-aTpAFERzNKezZU3+B5Ni4qasqJrpOwNBbZ5zeJLwGUM=";
};
vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";
pkgs/development/tools/regclient/default.nix
+3 -3
View File
@@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in
buildGoModule rec {
pname = "regclient";
version = "0.4.2";
version = "0.4.4";
tag = "v${version}";
src = fetchFromGitHub {
owner = "regclient";
repo = "regclient";
rev = tag;
sha256 = "sha256-lx2IQ3NpFuVr4Vb7vFcp/QVZBlLzi4VXFE7Sw3LKIXE=";
sha256 = "sha256-jIdbSDUpSKlb6RES6hx+r+vZyny56aWyjAurCI3mywk=";
};
vendorSha256 = "sha256-7kDl7gyKFM2gErDhOBCo6T4etwsAJnRpVtaJgv6BefM=";
vendorSha256 = "sha256-QTeVgvjRw2wBd8QGoVpRVTTh+Wwu2NEZYR1Z9R52/p0=";
outputs = [ "out" ] ++ bins;
pkgs/development/tools/rust/cargo-semver-checks/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, openssl
, stdenv
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks";
version = "0.9.2";
src = fetchFromGitHub {
owner = "obi1kenobi";
repo = "cargo-semver-check";
rev = "v${version}";
sha256 = "0w5qmbjkbd7ss2a3xhx186bykb3ghk6z0dmbz5i06k3acdv52gi7";
};
cargoSha256 = "sha256-RDFKI++5274bquh4bao10PQbdTOoCWcmueajIm8SvTw=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
Security
];
checkFlags = [
# requires nightly version of cargo-rustdoc
"--skip=adapter::tests"
];
meta = with lib; {
description = "A tool to scan your Rust crate for semver violations";
homepage = "https://github.com/obi1kenobi/cargo-semver-check";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
};
}
pkgs/development/tools/taplo-lsp/default.nix
-28
View File
@@ -1,28 +0,0 @@
{ fetchCrate, lib, openssl, pkg-config, rustPlatform, stdenv, Security }:
rustPlatform.buildRustPackage rec {
pname = "taplo-lsp";
version = "0.2.6";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-jd4l9iTCeHnUa/GC13paD3zDiCZBk9VgEbCDsOs/Xq4=";
};
cargoSha256 = "sha256-zQ303JFqnbulkWL4t5+fRWijaY9zd9tLKvrvdUEvKpY=";
# excludes test_tcp since it fails
cargoTestFlags = [ "test_stdio" ];
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optional stdenv.isLinux openssl
++ lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "A TOML toolkit written in Rust";
homepage = "https://taplo.tamasfe.dev";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}
pkgs/tools/misc/yubikey-manager/default.nix
+11 -5
View File
@@ -1,4 +1,5 @@
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps }:
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps
, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }:
python3Packages.buildPythonPackage rec {
pname = "yubikey-manager";
@@ -12,25 +13,30 @@ python3Packages.buildPythonPackage rec {
sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0=";
};
patches = lib.optionals (!pyOpenSSLSupport) [
./remove-pyopenssl-tests.patch
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"'
substituteInPlace "ykman/pcsc/__init__.py" \
--replace 'pkill' '${procps}/bin/pkill'
--replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill'
'';
nativeBuildInputs = with python3Packages; [ poetry-core ];
propagatedBuildInputs =
with python3Packages; [
with python3Packages; ([
click
cryptography
pyscard
pyusb
pyopenssl
six
fido2
] ++ [
] ++ lib.optionals pyOpenSSLSupport [
pyopenssl
]) ++ [
libu2f-host
libusb1
yubikey-personalization
pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch
+41
View File
@@ -0,0 +1,41 @@
diff --git a/pyproject.toml b/pyproject.toml
index 65a5943..e6932e0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,6 @@ packages = [
python = "^3.6"
dataclasses = {version = "^0.8", python = "<3.7"}
cryptography = ">=2.1, <39"
-pyOpenSSL = {version = ">=0.15.1", optional = true}
pyscard = "^1.9 || ^2.0"
fido2 = ">=0.9, <2.0"
click = "^7.0 || ^8.0"
diff --git a/tests/test_util.py b/tests/test_util.py
index 6ccda6c..b4460e4 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -8,7 +8,6 @@ from ykman.util import _parse_pkcs12_pyopenssl, _parse_pkcs12_cryptography
from ykman.otp import format_oath_code, generate_static_pw, time_challenge
from .util import open_file
from cryptography.hazmat.primitives.serialization import pkcs12
-from OpenSSL import crypto
import unittest
@@ -114,16 +113,6 @@ class TestUtilityFunctions(unittest.TestCase):
) as rsa_2048_key_cert_encrypted_pfx:
self.assertTrue(is_pkcs12(rsa_2048_key_cert_encrypted_pfx.read()))
- def test_parse_pkcs12(self):
- with open_file("rsa_2048_key_cert.pfx") as rsa_2048_key_cert_pfx:
- data = rsa_2048_key_cert_pfx.read()
-
- key1, certs1 = _parse_pkcs12_cryptography(pkcs12, data, None)
- key2, certs2 = _parse_pkcs12_pyopenssl(crypto, data, None)
- self.assertEqual(key1.private_numbers(), key2.private_numbers())
- self.assertEqual(1, len(certs1))
- self.assertEqual(certs1, certs2)
-
def test_is_pem(self):
self.assertFalse(is_pem(b"just a byte string"))
self.assertFalse(is_pem(None))
pkgs/top-level/all-packages.nix
+3
View File
@@ -14502,6 +14502,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-readme = callPackage ../development/tools/rust/cargo-readme {};
cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-sort = callPackage ../development/tools/rust/cargo-sort { };
cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck {
inherit (darwin.apple_sdk.frameworks) Security;