Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
52a11b56f9
61 changed files with 517 additions and 209 deletions
|
|
@ -1,7 +1,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "isso";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ asbachb ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "soapui";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ asbachb ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "tuxguitar";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ asbachb ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lndhub-go";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getAlby";
|
||||
repo = "lndhub.go";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-bwwypqaqlO+T/8ppKIHqGSzVerhQVl7YHrORyrpaa2w=";
|
||||
sha256 = "sha256-ZyqE6xFNsOwTBbLLn14jwNp9UkagTRgAQS+SEl+POaY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AiRbUSgMoU8nTzis/7H9HRW2/xZxXFf39JipRbukeiA=";
|
||||
vendorHash = "sha256-Wsejz/vYaT/maN7dYcrXPTXg30jZaldaslXbHcgHlRs=";
|
||||
|
||||
doCheck = false; # tests require networking
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ stdenv.mkDerivation {
|
|||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
maintainers = with lib.maintainers; [ sander rszibele asbachb ];
|
||||
maintainers = with lib.maintainers; [ sander rszibele ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nwg-panel";
|
||||
version = "0.7.16";
|
||||
version = "0.7.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-panel";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-dwnDrFQZVz6Vxa8bX0gFPBZFQwRJ3+wUy6Rsxvb2dhw=";
|
||||
sha256 = "sha256-HGbPBHf5PIjbuMSd/2fFSCLQ/7s1Xbys+KoGXctQOvM=";
|
||||
};
|
||||
|
||||
# No tests
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ let
|
|||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
sha256 = if stdenv.isDarwin then "sha256-x+9WG938YQFP/HF7B9xENOXFSdOrPFOJ1ufxXj3kXps=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao=";
|
||||
sha256 = if stdenv.isDarwin then "sha256-8cHNIpgRhEQRRcuM0t6zZNweb92nMe8GopgjYfOLRSA=" else "sha256-rDA0GXQ++QAT4UaT23WkCA5CKCuJsF4ca0g086AiCao=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "0.40.1";
|
||||
version = "0.40.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-riYrvg83mNdj4W8o/2cdZO+zie/WB+HVWXORJ4Uo/CE=";
|
||||
hash = "sha256-+09gLeifEFwG2Ou1tQP29hYHhr0Qn0hOKj7p7PB8Jfc=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -43,7 +43,7 @@ buildGoModule rec {
|
|||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-rbGKFZY9YEcBAFFxG6v3xaVLQxVoqIehN0LgINku3Xo=";
|
||||
vendorHash = "sha256-g82JRmfbKH/XEZx2aLZOcyen23vOxQXR7VyeAYxCSi4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/m00qek/swaynag-battery";
|
||||
description = "Shows a message when your battery is discharging ";
|
||||
maintainers = with maintainers; [ asbachb ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tickrs";
|
||||
version = "0.14.6";
|
||||
version = "0.14.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarkah";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tsPCx/4ap2udfZHRK5ebxRYEBYw2W6EgnDI6P3riV04=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8q/dL1Pv25TkL7PESybgIu+0lR0cr6qrK6ItE/r9pbI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-xpUI8IflLqBrwsU5YccGzQlPUJT46GJa5AdsIv9qfjU=";
|
||||
cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk=";
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
|
|
@ -20,6 +20,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Realtime ticker data in your terminal";
|
||||
homepage = "https://github.com/tarkah/tickrs";
|
||||
changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mredaelli ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.150.0";
|
||||
version = "0.151.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helmfile";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7wCt+JAuozsd+LifLArfPNwiKK/tDvgwpIwVCW4nU3Y=";
|
||||
sha256 = "sha256-hzsxuvHzdjNRqTk4yEBZhT/j1fVCAk+843kY4MsN0AM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vLLS+/Xfnlt6cvkNvXKX3DVLku1Q4bRCiv2vMTfOnfw=";
|
||||
vendorHash = "sha256-f0K3/xF+nJvlhtLAyLOah2RaZbaEqD8C28cPCLyaCXI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "karmor";
|
||||
version = "0.11.6";
|
||||
version = "0.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubearmor";
|
||||
repo = "kubearmor-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-toN/pIvmmMwIARhY1i/2nmrC5ZVyTR7pttqkyXNuMaE=";
|
||||
hash = "sha256-sXiv+aCYuN6GJB+6/G4Z1Oe/fB3OO+jhSvCAFUaiD3g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TE+VPOhkTPqQTapxAcJzlQzRZfmb1J4pAWUKiTGLnZE=";
|
||||
vendorHash = "sha256-9yCT9GspX2Tl6dISF8qvDF/Tm2mfwuDH+DrouFmxpj8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pachyderm";
|
||||
version = "2.4.5";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pachyderm";
|
||||
repo = "pachyderm";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DqBBetOyE8QALMEiYqA0rZEpPhBtde0STxiGrFqqFpY=";
|
||||
hash = "sha256-Gm/aUkwEbWxj76Q6My1Vw2gRn3+WVG6EJ7PLpQ1F130=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs=";
|
||||
vendorHash = "sha256-MVcbeQ4qAX9zVlT81yZd5xvo1ggVNpCZJozBoql2W9o=";
|
||||
|
||||
subPackages = [ "src/server/cmd/pachctl" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.5.25";
|
||||
version = "3.5.27";
|
||||
format = "pyproject";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
|
|
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Xb33/wz85RjBpRkKD09hfDr6txoB1ksKphbjrVt0QWg=";
|
||||
hash = "sha256-EeQs7WcNpnz2KrgUel9OF9pwW7WzKJrv5pvsZkV4RVg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230211";
|
||||
version = "20230223-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NeArgsl5xbgcXY8OKjF2wMdwJqgsBdR1XSrIWPqRWMs=";
|
||||
hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,9 +5,12 @@
|
|||
, cmake
|
||||
, gsl
|
||||
, libtool
|
||||
, findutils
|
||||
, llvmPackages
|
||||
, mpi
|
||||
, nest
|
||||
, pkg-config
|
||||
, boost
|
||||
, python3
|
||||
, readline
|
||||
, autoPatchelfHook
|
||||
|
|
@ -37,24 +40,36 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
autoPatchelfHook
|
||||
findutils
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gsl
|
||||
readline
|
||||
libtool # libltdl
|
||||
boost
|
||||
] ++ lib.optionals withPython [
|
||||
python3
|
||||
python3.pkgs.cython
|
||||
] ++ lib.optional withMpi mpi;
|
||||
] ++ lib.optional withMpi mpi
|
||||
++ lib.optional stdenv.isDarwin llvmPackages.openmp;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
numpy
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Dwith-python=${if withPython then "ON" else "OFF"}"
|
||||
"-Dwith-mpi=${if withMpi then "ON" else "OFF"}"
|
||||
"-Dwith-openmp=${if stdenv.isDarwin then "OFF" else "ON"}"
|
||||
"-Dwith-openmp=ON"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Alternative to autoPatchElf, moves libraries where
|
||||
# Nest expects them to be
|
||||
find $out/lib/nest -type f -exec ln -s {} $out/lib \;
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = nest;
|
||||
command = "nest --version";
|
||||
|
|
@ -64,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
description = "NEST is a command line tool for simulating neural networks";
|
||||
homepage = "https://www.nest-simulator.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ jiegec ];
|
||||
maintainers = with maintainers; [ jiegec davidcromp ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, zlib
|
||||
}:
|
||||
|
|
@ -16,6 +17,15 @@ stdenv.mkDerivation {
|
|||
hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/seryrzu/tandem_aligner/pull/4
|
||||
url = "https://github.com/seryrzu/tandem_aligner/commit/8b516c94f90aaa9cb84278aa811285d4204b03a9.patch";
|
||||
hash = "sha256-kD46SykXklG/avK0+sc61YKFw9Bes8ZgFAjVXmcpN8k=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "source/tandem_aligner";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -2,7 +2,7 @@ lib: version: with lib; {
|
|||
homepage = "https://openjdk.java.net/";
|
||||
license = licenses.gpl2Only;
|
||||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo asbachb ];
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ];
|
||||
mainProgram = "java";
|
||||
knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" ]) [
|
||||
|
|
|
|||
36
pkgs/development/coq-modules/coq-lsp/default.nix
Normal file
36
pkgs/development/coq-modules/coq-lsp/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, mkCoqDerivation, coq, serapi, makeWrapper, version ? null }:
|
||||
|
||||
mkCoqDerivation rec {
|
||||
pname = "coq-lsp";
|
||||
owner = "ejgallego";
|
||||
namePrefix = [ ];
|
||||
|
||||
useDune = true;
|
||||
|
||||
release."0.1.6.1+8.16".sha256 = "sha256-aX8/pN4fVYaF7ZEPYfvYpEZLiQM++ZG1fAhiLftQ9Aw=";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = isEq "8.16"; out = "0.1.6.1+8.16"; }
|
||||
] null;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
dune install ${pname} --prefix=$out
|
||||
wrapProgram $out/bin/coq-lsp --prefix OCAMLPATH : $OCAMLPATH
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ serapi ]
|
||||
++ (with coq.ocamlPackages; [ camlp-streams dune-build-info menhir uri yojson ]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Language Server Protocol and VS Code Extension for Coq";
|
||||
homepage = "https://github.com/ejgallego/coq-lsp";
|
||||
changelog = "https://github.com/ejgallego/coq-lsp/blob/${defaultVersion}/CHANGES.md";
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
license = licenses.lgpl21Only;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
release = {
|
||||
"8.16.0+0.16.0".sha256 = "sha256-Of5vO6wvqGyxagjGuuY3qCiLKbBr3VzLHiIn9U2R21E=";
|
||||
"8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc=";
|
||||
"8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp";
|
||||
"8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
|
||||
"8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy";
|
||||
|
|
@ -18,7 +18,7 @@ in
|
|||
|
||||
defaultVersion = with versions;
|
||||
lib.switch coq.version [
|
||||
{ case = isEq "8.16"; out = "8.16.0+0.16.0"; }
|
||||
{ case = isEq "8.16"; out = "8.16.0+0.16.3"; }
|
||||
{ case = isEq "8.15"; out = "8.15.0+0.15.0"; }
|
||||
{ case = isEq "8.14"; out = "8.14.0+0.14.0"; }
|
||||
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
|
||||
|
|
@ -88,7 +88,7 @@ in
|
|||
];
|
||||
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++
|
||||
lib.optional (version == "8.16.0+0.16.0" || version == "dev") coq.ocamlPackages.ppx_hash
|
||||
lib.optional (version == "8.16.0+0.16.3" || version == "dev") coq.ocamlPackages.ppx_hash
|
||||
;
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simdjson";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdjson";
|
||||
repo = "simdjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KyxtAOKhk3p/TuA0jz2hMCkGDwKLPC7rIodhHvcE4tk=";
|
||||
sha256 = "sha256-Yc4P54cn7cvP+ythlmOMIkDz7PuutJXsgkGhNUcoxvc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sofia-sip";
|
||||
version = "1.13.13";
|
||||
version = "1.13.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeswitch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZFQmm1GX7Uptyb9pIdTHccpoSLO4WdZuVPnMalOcfK0=";
|
||||
sha256 = "sha256-L1OXmZCVWDPILhooIzw/bYK69zKwzkBluV9Tlf0vw4g=";
|
||||
};
|
||||
|
||||
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "talloc";
|
||||
version = "2.3.4";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-F5+eviZeZ+SrLCbK0rfeS2p3xsIS+WaQM4KGnwa+ZQU=";
|
||||
sha256 = "sha256-bfNoYsQkZu+I82BERROHDvRpNPkBbIQ4PMQAin0MRro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.206";
|
||||
version = "0.6.207";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9NyZaoZgHl0qyiJG2ZiarsXQy1o8fsbKGCpPBO/A1hY=";
|
||||
sha256 = "sha256-7WPyhhhy9BspbqlfV5mFvD8ny2RIbnONrBguhWIgL2w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioqsw";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8WfQTaa9BiMHDLxCZNqcFmi0ifEC2xgyN2cDBBtBDdI=";
|
||||
hash = "sha256-Z7Q9b+ameddvGu9KJUNsaqOHiu0qXnpzuiZwg+/0+64=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
57
pkgs/development/python-modules/app-model/default.nix
Normal file
57
pkgs/development/python-modules/app-model/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, in-n-out
|
||||
, psygnal
|
||||
, pydantic
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
, setuptools-scm
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "app-model";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyapp-kit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nZnIb2QHfpkPirjQPiBdLd7pc1NNn97fdjGxKs0lWQU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
psygnal
|
||||
pydantic
|
||||
in-n-out
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"app_model"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to implement generic application schema";
|
||||
homepage = "https://github.com/pyapp-kit/app-model";
|
||||
changelog = "https://github.com/pyapp-kit/app-model/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,26 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, flake8
|
||||
, pydocstyle
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-docstrings";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9fe7c6a306064af8e62a055c2f61e9eb1da55f84bb39caef2b84ce53708ac34b";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyCQA";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EafLWySeHB81HRcXiDs56lbUZzGvnT87WVqln0PoLCk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ flake8 pydocstyle ];
|
||||
propagatedBuildInputs = [
|
||||
flake8
|
||||
pydocstyle
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flake8_docstrings" ];
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flake8_docstrings"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extension for flake8 which uses pydocstyle to check docstrings";
|
||||
homepage = "https://gitlab.com/pycqa/flake8-docstrings";
|
||||
homepage = "https://github.com/pycqa/flake8-docstrings";
|
||||
changelog = "https://github.com/PyCQA/flake8-docstrings/blob/${version}/HISTORY.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ smaret ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.2.26";
|
||||
version = "0.2.27";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "marcelblijleven";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-OHY8Cd2SF55tQZ85bUU564sHzjbTJcPwcJwVGucvzyM=";
|
||||
sha256 = "sha256-J7hmtFEvJ2ivVi5UsahcpWen/gw65bf3rhBEpiOKsWk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
60
pkgs/development/python-modules/in-n-out/default.nix
Normal file
60
pkgs/development/python-modules/in-n-out/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, cython_3
|
||||
, fetchPypi
|
||||
, future
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, toolz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "in-n-out";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PuzjidORMFVlmFZbmnu9O92FoiuXrC8NNRyjwdodriY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython_3
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
toolz
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"in_n_out"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (pythonAtLeast "3.11") [
|
||||
# Fatal Python error
|
||||
"tests/test_injection.py"
|
||||
"tests/test_processors.py"
|
||||
"tests/test_providers.py"
|
||||
"tests/test_store.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for dependency injection and result processing";
|
||||
homepage = "https://app-model.readthedocs.io/";
|
||||
changelog = "https://github.com/pyapp-kit/in-n-out/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "json-schema-for-humans";
|
||||
version = "0.44";
|
||||
version = "0.44.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "coveooss";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-LsZPf5PVXPSyHNgfBdjH4hG4OFIdSprO5uj3saPDqzo=";
|
||||
hash = "sha256-qja4mYl8G/t3FqFoVToLo76XthJ4RXF4y6odkPZDoq4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,29 +1,50 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, pytest
|
||||
, ipython
|
||||
, ipykernel
|
||||
, qtconsole
|
||||
, napari-plugin-engine
|
||||
, imageio
|
||||
}: buildPythonPackage rec {
|
||||
, ipykernel
|
||||
, ipython
|
||||
, napari-plugin-engine
|
||||
, pythonOlder
|
||||
, qtconsole
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "napari-console";
|
||||
version = "0.0.4";
|
||||
version = "0.0.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "napari";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aVdYOzkZ+dqB680oDjNCg6quXU+QgUZI09E/MSTagyA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vHLCVMgrcs54pGb48wQpc0h7QBIfE6r7hCSoDNI3QvA=";
|
||||
};
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
# setup.py somehow requires pytest
|
||||
propagatedBuildInputs = [ pytest ipython ipykernel napari-plugin-engine imageio qtconsole ];
|
||||
chechInputs = [ pytestCheckHook ];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
imageio
|
||||
ipykernel
|
||||
ipython
|
||||
napari-plugin-engine
|
||||
qtconsole
|
||||
];
|
||||
|
||||
# Circular dependency: napari
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"napari_console"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A plugin that adds a console to napari";
|
||||
homepage = "https://github.com/napari/napari-console";
|
||||
|
|
|
|||
|
|
@ -3,22 +3,38 @@
|
|||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
}: buildPythonPackage rec {
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "napari-plugin-engine";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "napari";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE=";
|
||||
};
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
doCheck = false;
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
# Circular dependency: napari
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"napari_plugin_engine"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fork of pluggy for napari - plugin management package";
|
||||
description = "First generation napari plugin engine";
|
||||
homepage = "https://github.com/napari/napari-plugin-engine";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SomeoneSerge ];
|
||||
|
|
|
|||
|
|
@ -1,26 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
, vispy
|
||||
, napari-plugin-engine
|
||||
, imageio
|
||||
}: buildPythonPackage rec {
|
||||
, napari-plugin-engine
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, vispy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "napari-svg";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "napari";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-20NLi6JTugP+hxqF2AnhSkuvhkGGbeG+tT3M2SZbtRc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lvI6RWT9oUE95vL6WO75CASc/Z+1G5UMm2p8vhqIjA0=";
|
||||
};
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
propagatedBuildInputs = [ vispy napari-plugin-engine imageio ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
doCheck = false; # Circular dependency: napari
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
vispy
|
||||
napari-plugin-engine
|
||||
imageio
|
||||
];
|
||||
|
||||
# Circular dependency: napari
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A plugin for writing svg files from napari";
|
||||
homepage = "https://github.com/napari/napari-svg";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{ lib
|
||||
, mkDerivationWith
|
||||
, appdirs
|
||||
, app-model
|
||||
, buildPythonPackage
|
||||
, cachey
|
||||
, certifi
|
||||
, dask
|
||||
, docstring-parser
|
||||
, fetchFromGitHub
|
||||
|
|
@ -23,6 +25,7 @@
|
|||
, scikitimage
|
||||
, scipy
|
||||
, setuptools-scm
|
||||
, sphinx
|
||||
, superqt
|
||||
, tifffile
|
||||
, toolz
|
||||
|
|
@ -49,15 +52,24 @@ mkDerivationWith buildPythonPackage rec {
|
|||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "scikit-image>=0.19.1" "scikit-image" \
|
||||
--replace "sphinx<5" "sphinx" \
|
||||
--replace "vispy>=0.11.0,<0.12" "vispy"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
app-model
|
||||
appdirs
|
||||
cachey
|
||||
dask.optional-dependencies.array
|
||||
certifi
|
||||
dask
|
||||
docstring-parser
|
||||
imageio
|
||||
jsonschema
|
||||
|
|
@ -74,6 +86,7 @@ mkDerivationWith buildPythonPackage rec {
|
|||
pyyaml
|
||||
scikitimage
|
||||
scipy
|
||||
sphinx
|
||||
superqt
|
||||
tifffile
|
||||
toolz
|
||||
|
|
@ -81,13 +94,7 @@ mkDerivationWith buildPythonPackage rec {
|
|||
typing-extensions
|
||||
vispy
|
||||
wrapt
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "scikit-image>=0.19.1" "scikit-image" \
|
||||
--replace "vispy>=0.10.0,<0.11" "vispy"
|
||||
'';
|
||||
] ++ dask.optional-dependencies.array;
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
|
|
@ -98,6 +105,7 @@ mkDerivationWith buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A fast, interactive, multi-dimensional image viewer";
|
||||
homepage = "https://github.com/napari/napari";
|
||||
changelog = "https://github.com/napari/napari/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SomeoneSerge ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
|
||||
hash = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -61,13 +61,15 @@ buildPythonPackage rec {
|
|||
"test_mixed_pairs"
|
||||
"test_multiple_diagrams"
|
||||
"test_n_pixels"
|
||||
# https://github.com/scikit-tda/persim/issues/67
|
||||
"test_persistenceimager"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Distances and representations of persistence diagrams";
|
||||
homepage = "https://persim.scikit-tda.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "phonenumbers";
|
||||
version = "8.13.3";
|
||||
version = "8.13.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fQxFwVQBOXC3i4b0GI4OAKjnfWvr73yB79wDjbh27ro=";
|
||||
hash = "sha256-+L2Sl1unRjt4KK4vleEDe34KuPAj6ej/t8Vg/X9dZtc=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -32,6 +32,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module for handling international phone numbers";
|
||||
homepage = "https://github.com/daviddrysdale/python-phonenumbers";
|
||||
changelog = "https://github.com/daviddrysdale/python-phonenumbers/blob/v${version}/python/HISTORY.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fadenb ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flask
|
||||
|
|
@ -42,6 +43,10 @@ buildPythonPackage rec {
|
|||
"pytest_flask"
|
||||
];
|
||||
|
||||
pytestFlagsArray = lib.optionals stdenv.isDarwin [
|
||||
"--ignore=tests/test_live_server.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of pytest fixtures to test Flask applications";
|
||||
homepage = "https://pytest-flask.readthedocs.io/";
|
||||
|
|
|
|||
|
|
@ -1,35 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, cython
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, scipy
|
||||
, scikit-learn
|
||||
, persim
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scikit-learn
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ripser";
|
||||
version = "0.6.1";
|
||||
version = "0.6.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd";
|
||||
hash = "sha256-eps+lCCGnFDfhemkRskSuK+BYh5iyhr4+UksYzW35ZQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/scikit-tda/ripser.py/commit/4baa248994cee9a65d710fac91809bad8ed4e5f1.patch";
|
||||
sha256 = "sha256-J/nxMOGOUiBueojJrUlAaXwktHDploYG/XL8/siF2kY=";
|
||||
})
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cython
|
||||
numpy
|
||||
scipy
|
||||
scikit-learn
|
||||
|
|
@ -47,10 +44,15 @@ buildPythonPackage rec {
|
|||
echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ripser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Lean Persistent Homology Library for Python";
|
||||
homepage = "https://ripser.scikit-tda.org";
|
||||
changelog = "https://github.com/scikit-tda/ripser.py/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bacon";
|
||||
version = "2.4.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-k87EgsH7EdnqYBoXHpPu7hB/goEXuZsz8mNsrvM+Hgw=";
|
||||
hash = "sha256-NszXIVgK65gTsiEmOaw3cMaR0A+ojNYa08ETJ6dP+4c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ujc3tH9I2WqwxmqBaUdE8lJQtj7XS56IVaxfZWhmvF8=";
|
||||
cargoHash = "sha256-ssrZ6v5euf8AgAdvsjYt6L+dxrIBYoaiHxvBQN2KE+8=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "convco";
|
||||
version = "0.3.15";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "convco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a/C93Uuf++FIBqZSA0LaUQX4ZQoUMD2lHnV5MRlCw4g=";
|
||||
sha256 = "sha256-Fv1yaBnfn/wik1Ix24shwfritwxno3NoeJgHPsHgZOI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JQvLezX8L2yEDyiVxH93Uk1V5qFjwXNVQWEI9ur9YOQ=";
|
||||
cargoHash = "sha256-q0VrN+5Ypq4ga/gI5MlyRaMdD8NxzuaZ804KaRQzpRs=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dprint";
|
||||
version = "0.34.4";
|
||||
version = "0.34.5";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-JCCmGlvL2OLkeq25lCzVRXvmVCAvkwO4yD81gbKmSsw=";
|
||||
sha256 = "sha256-kdpiOeXizCHLxEWlq991T6h7sbt0chu7Dou8V8yad94=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5biUsZTLoYcEqOPJnzR8YpdN7U1ztXjprRhHTUxKCl4=";
|
||||
cargoHash = "sha256-qzb2H9acWWIpG9tjFzU5ApHaBKfCYJcSSYjOWQnEebM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "toast";
|
||||
version = "0.45.5";
|
||||
version = "0.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stepchowfun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7EF9DCT8Vg7aGOUlRG9c4Lv2EhCX/P9k4zQC6Ruqv0c=";
|
||||
sha256 = "sha256-rDT7ZpixE77imy/HVwLET+O0uCZ+wFhXGqcWq46Ud2w=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-tyZrNUT2i9i0yOqz1KqIuFSb4PO+fx1SNa+ZVNfIGfM=";
|
||||
cargoHash = "sha256-B5H8YkYlcF/Z6SlsW5lWwHZ9tYfOb54Pu1KNVY3eXP8=";
|
||||
|
||||
checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "xc";
|
||||
version = "0.0.154";
|
||||
version = "0.0.159";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joerdav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GJBSPO0PffGdGAHofd1crEFXJi2xqgd8Vk2/g4ff+E4=";
|
||||
sha256 = "sha256-5Vw/UStMtP5CHbSCOzeD4LMJccPG34Rxw9VHc9Ut3oM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XDJdCh6P8ScSvxY55ExKgkgFQqmBaM9fMAjAioEQ0+s=";
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation (self: {
|
|||
|
||||
dontConfigure = true;
|
||||
|
||||
NIX_CFLAGS_COMPILE="-I${lib.getDev gettext}/share/gettext/";
|
||||
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev gettext}/share/gettext/";
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
|
|
|
|||
|
|
@ -49,28 +49,39 @@ let
|
|||
};
|
||||
|
||||
passthru = { inherit sources; };
|
||||
|
||||
fhsUserEnvAnki = buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
|
||||
name = "anki";
|
||||
|
||||
# Dependencies of anki
|
||||
targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]);
|
||||
|
||||
runScript = writeShellScript "anki-wrapper.sh" ''
|
||||
exec ${unpacked}/bin/anki
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share
|
||||
cp -R ${unpacked}/share/applications \
|
||||
${unpacked}/share/man \
|
||||
${unpacked}/share/pixmaps \
|
||||
$out/share/
|
||||
'';
|
||||
|
||||
inherit meta passthru;
|
||||
});
|
||||
|
||||
fhsUserEnvAnkiWithVersion = fhsUserEnvAnki.overrideAttrs (oldAttrs: {
|
||||
# buildFHSUserEnv doesn't have an easy way to set the version of the
|
||||
# resulting derivation, so we manually override it here. This makes
|
||||
# it clear to end users the version of anki-bin. Without this, users
|
||||
# might assume anki-bin is an old version of Anki.
|
||||
name = "${pname}-${version}";
|
||||
});
|
||||
in
|
||||
|
||||
if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
|
||||
name = "anki";
|
||||
|
||||
# Dependencies of anki
|
||||
targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]);
|
||||
|
||||
runScript = writeShellScript "anki-wrapper.sh" ''
|
||||
exec ${unpacked}/bin/anki
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share
|
||||
cp -R ${unpacked}/share/applications \
|
||||
${unpacked}/share/man \
|
||||
${unpacked}/share/pixmaps \
|
||||
$out/share/
|
||||
'';
|
||||
|
||||
inherit meta passthru;
|
||||
}) else stdenv.mkDerivation {
|
||||
if stdenv.isLinux then fhsUserEnvAnkiWithVersion
|
||||
else stdenv.mkDerivation {
|
||||
inherit pname version passthru;
|
||||
|
||||
src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
|||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types";
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace ./Makefile \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Adjust power management settings for Ryzen Mobile Processors.";
|
||||
homepage = "https://github.com/FlyGoat/RyzenAdj";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ asbachb ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.14.4";
|
||||
version = "1.15.0";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-aPJcb7nIjNIT5Bt/On+KFHHA2bNBO4y7HDFpsjhh8j0=";
|
||||
sha256 = "sha256-WJQHBSwmcJiUGt69DMMZxs+xEk3z+fadSHoHvxb48ZU=";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
|
|
@ -26,7 +26,7 @@ buildGoModule rec {
|
|||
# has a split module structure in one repo
|
||||
subPackages = ["." "connect/certgen"];
|
||||
|
||||
vendorHash = "sha256-g7Pi/wOjClwcuqeHQjhqBtnORArx1G4Znqvfl0bf3V4=";
|
||||
vendorHash = "sha256-XwoZ/iwsZ/zXgPRGfBit5TO2NDS2pTEO0FT4KSUhJtA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-DNNG_ENABLE_TLS=ON"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type";
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An ultra-lightweight and blazing-fast MQTT broker for IoT edge";
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
(enableFeature true "arcfour")
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE
|
||||
env.NIX_CFLAGS_COMPILE
|
||||
= optionalString stdenv.isDarwin "-DBIND_8_COMPAT";
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://github.com/ggerganov/whisper.cpp";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eget";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyedidia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tUHA5LbTOz20ydMM8141VjCUBsxI+Wzkgfh27aq/2y4=";
|
||||
sha256 = "sha256-OOqfZ2uS3sYBH9xrlQN1iSNdNE9RGi6qiDXfPgf2aB0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-J8weaJSC+k8BnijG2Jm2GYUZmEhASrrCDxb46ZGmCMI=";
|
||||
vendorSha256 = "sha256-A3lZtV0pXh4KxINl413xGbw2Pz7OzvIQiFSRubH428c=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,18 +7,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "skim";
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-LkPkwYsaSLfaZktHF23Fgaks+fDlbB1S6SRgXtJRBqQ=";
|
||||
sha256 = "sha256-d0gzeyOc9UudgTrTFt5OhUAsTy/SYMvRMyph2yAD9H8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
outputs = [ "out" "vim" ];
|
||||
|
||||
cargoSha256 = "sha256-lG26dgvjqCZ/4KgzurMrlhl+JKec+xLt/5uA6XcsSPk=";
|
||||
cargoHash = "sha256-ZLA1ZE/VLZyzQzIECcabxKup409YBZRpHdhR2k/+4lY=";
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "you-get";
|
||||
version = "0.4.1620";
|
||||
version = "0.4.1650";
|
||||
format = "setuptools";
|
||||
|
||||
# Tests aren't packaged, but they all hit the real network so
|
||||
# probably aren't suitable for a build environment anyway.
|
||||
|
|
@ -15,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-wCDaT9Nz1ZiSsqFwX1PXHq6QF6fjLRI9wwvvWxcmYOY=";
|
||||
sha256 = "sha256-s8lEz3pjzEaMzMiBbc5/wAjC5rW6Uq7+XOIIGBijrUc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -36,6 +37,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
--bash contrib/completion/you-get-completion.bash
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"you_get"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiny command line utility to download media contents from the web";
|
||||
homepage = "https://you-get.org";
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.13.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Afj2pllGPL86hhSNDSbvO+GkA62CI8V5dnUa0mjEMCg=";
|
||||
sha256 = "sha256-H4jqpy1ELRfTUhLO8Ylv6a/uKkvapdVhIGM0e3WPdlo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3uEcb0nVHrfHZTZ/j/9l6zR1zMfLR0mVaN/Hydyam4Q=";
|
||||
vendorHash = "sha256-2/kk4qTO85fYnNO5vXIFxxFR55xZ5wenogJTMsLfYsg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,16 @@
|
|||
{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, installShellFiles, PCSC, pivKeySupport ? true, pkcs11Support ? true }:
|
||||
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, pcsclite
|
||||
, pkg-config
|
||||
, installShellFiles
|
||||
, PCSC
|
||||
, pivKeySupport ? true
|
||||
, pkcs11Support ? true
|
||||
, testers
|
||||
, cosign
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "cosign";
|
||||
version = "2.0.0";
|
||||
|
|
@ -11,7 +22,8 @@ buildGoModule rec {
|
|||
sha256 = "sha256-919oxYi4e56EhSBN0FdcEZBA430owaDnKHkgTneScXw=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
|
||||
buildInputs =
|
||||
lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
|
||||
++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
|
|
@ -22,7 +34,7 @@ buildGoModule rec {
|
|||
"cmd/cosign"
|
||||
];
|
||||
|
||||
tags = [] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ];
|
||||
tags = [ ] ++ lib.optionals pivKeySupport [ "pivkey" ] ++ lib.optionals pkcs11Support [ "pkcs11key" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -31,6 +43,8 @@ buildGoModule rec {
|
|||
"-X sigs.k8s.io/release-utils/version.gitTreeState=clean"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preCheck = ''
|
||||
# test all paths
|
||||
unset subPackages
|
||||
|
|
@ -47,6 +61,12 @@ buildGoModule rec {
|
|||
--zsh <($out/bin/cosign completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = cosign;
|
||||
command = "cosign version";
|
||||
version = "v${version}";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sigstore/cosign";
|
||||
changelog = "https://github.com/sigstore/cosign/releases/tag/v${version}";
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ stdenv.mkDerivation {
|
|||
doCheck = true;
|
||||
checkPhase = "./hash_extender --test";
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp hash_extender $out/bin
|
||||
|
|
|
|||
|
|
@ -8175,9 +8175,7 @@ with pkgs;
|
|||
|
||||
hashrat = callPackage ../tools/security/hashrat { };
|
||||
|
||||
hash_extender = callPackage ../tools/security/hash_extender {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
hash_extender = callPackage ../tools/security/hash_extender { };
|
||||
|
||||
hash-identifier = callPackage ../tools/security/hash-identifier { };
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ let
|
|||
coq-elpi = callPackage ../development/coq-modules/coq-elpi {};
|
||||
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
|
||||
coq-haskell = callPackage ../development/coq-modules/coq-haskell { };
|
||||
coq-lsp = callPackage ../development/coq-modules/coq-lsp {};
|
||||
coq-record-update = callPackage ../development/coq-modules/coq-record-update { };
|
||||
coqeal = callPackage ../development/coq-modules/coqeal {};
|
||||
coqhammer = callPackage ../development/coq-modules/coqhammer {};
|
||||
|
|
|
|||
|
|
@ -532,6 +532,8 @@ self: super: with self; {
|
|||
|
||||
aplpy = callPackage ../development/python-modules/aplpy { };
|
||||
|
||||
app-model = callPackage ../development/python-modules/app-model { };
|
||||
|
||||
appdirs = callPackage ../development/python-modules/appdirs { };
|
||||
|
||||
applicationinsights = callPackage ../development/python-modules/applicationinsights { };
|
||||
|
|
@ -4640,6 +4642,8 @@ self: super: with self; {
|
|||
|
||||
imutils = callPackage ../development/python-modules/imutils { };
|
||||
|
||||
in-n-out = callPackage ../development/python-modules/in-n-out { };
|
||||
|
||||
in-place = callPackage ../development/python-modules/in-place { };
|
||||
|
||||
incomfort-client = callPackage ../development/python-modules/incomfort-client { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue