Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c451d8d636
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho
|
||||
- made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
|
||||
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
|
||||
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
|
||||
- [22.11 Release Notes (or backporting 21.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
|
||||
- [22.11 Release Notes (or backporting 22.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2211-release-notes)
|
||||
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
|
||||
- [ ] (Module updates) Added a release notes entry if the change is significant
|
||||
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
|
||||
|
||||
@ -51,9 +51,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
|
||||
system, [Hydra](https://hydra.nixos.org/).
|
||||
|
||||
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
|
||||
* [Continuous package builds for the NixOS 21.11 release](https://hydra.nixos.org/jobset/nixos/release-21.11)
|
||||
* [Continuous package builds for the NixOS 22.05 release](https://hydra.nixos.org/jobset/nixos/release-22.05)
|
||||
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
|
||||
* [Tests for the NixOS 21.11 release](https://hydra.nixos.org/job/nixos/release-21.11/tested#tabs-constituents)
|
||||
* [Tests for the NixOS 22.05 release](https://hydra.nixos.org/job/nixos/release-22.05/tested#tabs-constituents)
|
||||
|
||||
Artifacts successfully built with Hydra are published to cache at
|
||||
https://cache.nixos.org/. When successful build and test criteria are
|
||||
|
||||
@ -615,7 +615,7 @@
|
||||
version of the <literal>xmonad</literal> module, which will
|
||||
break your configuration if you use <literal>launch</literal>
|
||||
as entrypoint. The example code the corresponding nixos module
|
||||
was adjusted, you way want to have a look at it.
|
||||
was adjusted, you may want to have a look at it.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
||||
@ -195,7 +195,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The update of the haskell package set brings with it a new version of the `xmonad`
|
||||
module, which will break your configuration if you use `launch` as entrypoint. The
|
||||
example code the corresponding nixos module was adjusted, you way want to have a look at it.
|
||||
example code the corresponding nixos module was adjusted, you may want to have a look at it.
|
||||
|
||||
- The `home-assistant` module now requires users that don't want their
|
||||
configuration to be managed declaratively to set
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jPR996MEBCTT3k12qOdW1AO8LxA/pvQnw0qiW6//lcs=";
|
||||
sha256 = "sha256-8GMk7xBMhml0X/8YRuN3FsEF2TWDxtb0eoP/cduKXNg=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
||||
@ -54,6 +54,8 @@ git clone --depth 1 --branch v${newVersion} -c advice.detachedHead=false https:/
|
||||
export GNUPGHOME=$tmpdir
|
||||
# Fetch Nicolas Dorier's key (64-bit key ID: 6618763EF09186FE)
|
||||
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AB4CFA9895ACA0DBE27F6B346618763EF09186FE 2> /dev/null
|
||||
# Fetch Andrew Camilleri's key (64-bit key ID: 8E5530D9D1C93097)
|
||||
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 836C08CF3F523BB7A8CB8ECF8E5530D9D1C93097 2> /dev/null
|
||||
echo
|
||||
echo "Verifying commit"
|
||||
git -C $repo verify-commit HEAD
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nearcore";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
# https://github.com/near/nearcore/tags
|
||||
src = fetchFromGitHub {
|
||||
@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec {
|
||||
repo = "nearcore";
|
||||
# there is also a branch for this version number, so we need to be explicit
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-N3A+hy5I1/yJ3IN9gDw3m1IZ9qK8LNhn3fuXLMn23bg=";
|
||||
sha256 = "sha256-WoQtDdbFcvl6Wp5uv2tr/W/YYH8dyezF+LzSJ5oJcYY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-g07liit048TSL73wFyDK+eKu33Z6fPJcJ+VeGgTtuS8=";
|
||||
cargoSha256 = "sha256-7h14XzhhPmkPoTx0kkJl7I7CPqbRAtxa1zpplYxg4p4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace neard/build.rs \
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "18.0.6";
|
||||
version = "18.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
|
||||
sha256 = "939d23f45f82bc4978ff3cb5d15d096f8af9658fb9f9211d3849998f6a0bd3a9";
|
||||
sha256 = "0abb33e790071368d1f549e5f41e8692cd565bdae8fabee23e660ace2020a743";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,12 +13,12 @@
|
||||
let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; };
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "koreader";
|
||||
version = "2022.03.1";
|
||||
version = "2022.05.1";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb";
|
||||
sha256 = "sha256-ZoqITWPR60G4xY9InrtIY9rCWUk0PidGFZokHLWl5ps=";
|
||||
sha256 = "sha256-Uz8fzF/SdKNRywoIb8B/iHRuXDwRyw7wH7bL9vRzPfY=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -66,13 +66,13 @@ let
|
||||
# Put all the providers we not longer support in this list.
|
||||
removed-providers =
|
||||
let
|
||||
archived = date: throw "the provider has been archived by upstream on ${date}";
|
||||
removed = date: throw "removed from nixpkgs on ${date}";
|
||||
archived = name: date: throw "the ${name} terraform provider has been archived by upstream on ${date}";
|
||||
removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}";
|
||||
in
|
||||
lib.optionalAttrs config.allowAliases {
|
||||
opc = archived "2022/05";
|
||||
oraclepaas = archived "2022/05";
|
||||
template = archived "2022/05";
|
||||
opc = archived "opc" "2022/05";
|
||||
oraclepaas = archived "oraclepaas" "2022/05";
|
||||
template = archived "template" "2022/05";
|
||||
};
|
||||
|
||||
# excluding aliases, used by terraform-full
|
||||
|
||||
@ -4,11 +4,11 @@ let
|
||||
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cinny";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
|
||||
sha256 = "13jg28dypp7x6wgsc6vikbqnagp1grqsdmmwhll8qz9ih9rq9fxd";
|
||||
sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
56
pkgs/applications/science/biology/astral/default.nix
Normal file
56
pkgs/applications/science/biology/astral/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, jdk8
|
||||
, makeWrapper
|
||||
, jre8
|
||||
, zip
|
||||
}:
|
||||
let
|
||||
jdk = jdk8;
|
||||
jre = jre8;
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "astral";
|
||||
version = "5.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smirarab";
|
||||
repo = "ASTRAL";
|
||||
rev = "v${version}";
|
||||
sha256 = "043w2z6gbrisqirdid022f4b8jps1pp5syi344krv2bis1gjq5sn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jdk makeWrapper jre zip ];
|
||||
|
||||
buildPhase = ''
|
||||
patchShebangs ./make.sh
|
||||
./make.sh
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
java -jar astral.${version}.jar -i main/test_data/song_primates.424.gene.tre
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/lib
|
||||
mkdir -p $out/bin
|
||||
mv astral.${version}.jar $out/share/
|
||||
mv lib/*.jar $out/share/lib
|
||||
mv Astral.${version}.zip $out/share/
|
||||
cp -a main/test_data $out/share/
|
||||
makeWrapper ${jre}/bin/java $out/bin/astral \
|
||||
--add-flags "-jar $out/share/astral.${version}.jar"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/smirarab/ASTRAL";
|
||||
description = "Tool for estimating an unrooted species tree given a set of unrooted gene trees";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ bzizou ];
|
||||
};
|
||||
}
|
||||
@ -55,11 +55,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "42.0.1";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "GuIS/4mZFVQuxTtU2VtozfJx2VjPUSzcP+3Hgixu4SM=";
|
||||
sha256 = "lvXQEbdQjbVhvw0WbA6p6LEhgFxA5dnzYRkkXBUXIIA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -62,7 +62,7 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk4";
|
||||
version = "4.6.4";
|
||||
version = "4.6.5";
|
||||
|
||||
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
|
||||
outputBin = "dev";
|
||||
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
|
||||
sha256 = "p5orvMeTG3A/xPofy+G5BuIpoVIthU1SKAF2anm8rJ8=";
|
||||
sha256 = "+kLDcfSckJFnEeFVkdh9S+5EOMJ78GknFVgYB2KL6cI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pico-sdk";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cc1UTc1aswtJzuaUdYNcCzLtQ9+Wggiy/eRE+UoxSgE=";
|
||||
sha256 = "sha256-Yf3cVFdI8vR/qcxghcx8fsbYs1qD8r6O5aqZ0AkSLDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
buildDunePackage {
|
||||
pname = "json-data-encoding-bson";
|
||||
|
||||
inherit (json-data-encoding) version src useDune2 doCheck;
|
||||
inherit (json-data-encoding) version src doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
json-data-encoding
|
||||
|
||||
@ -2,15 +2,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "json-data-encoding";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
minimalOCamlVersion = "4.10";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "json-data-encoding";
|
||||
rev = "${version}";
|
||||
sha256 = "0m0xx382wr44wz7gxf7mpfjx2w287pvqhg2lfvzmclfq3y5iy6mx";
|
||||
sha256 = "sha256-4FNUU82sq3ylgw0lxHlwi1OV58NRRh9zJqE47YyQZSc=";
|
||||
};
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
uri
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "resto-acl";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
inherit (resto) src version meta doCheck;
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
resto
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "resto-cohttp-client";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
inherit (resto) src version meta doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
resto
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "resto-cohttp-self-serving-client";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
inherit (resto) src version meta doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
resto
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "resto-cohttp-server";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
inherit (resto) src version meta doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
resto
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "resto-cohttp";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
inherit (resto) src version meta doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
resto
|
||||
|
||||
@ -2,16 +2,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "resto";
|
||||
version = "0.6.1";
|
||||
version = "0.7";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "resto";
|
||||
rev = "v${version}";
|
||||
sha256 = "13h3zga7h2jhgbyda1q53szbpxcz3vvy3c51mlqk3jh9jq2wrn87";
|
||||
sha256 = "sha256-aX7w/rsoOmbni8BOXa0WnoQ47Y5zl91vWvMobuNFT3Y=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
uri
|
||||
];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "resto-directory";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
inherit (resto) src version meta doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
resto
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
{ buildDunePackage, resto, resto-directory, ezresto, lwt }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "ezresto-directory";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ezresto
|
||||
resto-directory
|
||||
resto
|
||||
lwt
|
||||
];
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
{ lib, buildDunePackage, resto, resto-json, uri }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "ezresto";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
uri
|
||||
resto
|
||||
resto-json
|
||||
];
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildDunePackage {
|
||||
pname = "resto-json";
|
||||
inherit (resto) src version meta useDune2 doCheck;
|
||||
inherit (resto) src version meta doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
resto
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-/v0om2SbikNpMCvJhwIGlWSiZilhnJi7qj8SCV+zHCU=";
|
||||
sha256 = "sha256-x7TaSpmNd0YUgh81Favpo6qZgRsVeIyvvFfH3UCCqsQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hatasmota";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "emontnemery";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-pIMao1zZXJJVEG9J9ypWlo/JF0nmci49ANcqHJSY2AY=";
|
||||
sha256 = "sha256-1tCTkmhO9HyfdQuymTtFdCvxG9+Xs5/dEN5tB3/2fpQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
45
pkgs/development/python-modules/huum/default.nix
Normal file
45
pkgs/development/python-modules/huum/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "huum";
|
||||
version = "0.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ldhAg9zGCEYvya01s6AHzALI4dS+d0R73c62YZyk19M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pydantic
|
||||
];
|
||||
|
||||
# Tests are not shipped and source not tagged
|
||||
# https://github.com/frwickst/pyhuum/issues/2
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"huum"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for for Huum saunas";
|
||||
homepage = "https://github.com/frwickst/pyhuum";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nettigo-air-monitor";
|
||||
version = "1.2.4";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zmmJ3F2Fl4u7vOx1h5Z0LtWL0/5xmZiFRY2NU8Tc0MY=";
|
||||
sha256 = "sha256-O/HJTqmNmnx85AVuhRRxNqS1W0dZyKFSPVFqaBXAuhU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -36,13 +36,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest-runner" ""
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov --cov-report term-missing " ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nettigo_air_monitor"
|
||||
];
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.90";
|
||||
version = "2.1.91";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-F9kpkp1Z70TWZjg97X0ZHMommswj07sJxQXiKVPMnRU=";
|
||||
hash = "sha256-nlEdCdFxF/maOZtpUwNVExnmqUhdAfzlbrEMxAHvUxE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }:
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which, pythonAtLeast }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfuse3";
|
||||
@ -9,6 +9,8 @@ buildPythonPackage rec {
|
||||
sha256 = "22d146dac59a8429115e9a93317975ea54b35e0278044a94d3fac5b4ad5f7e33";
|
||||
};
|
||||
|
||||
disabled = pythonAtLeast "3.10";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ fuse3 ];
|
||||
@ -26,7 +28,6 @@ buildPythonPackage rec {
|
||||
disabledTests = [ "test_listdir" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Python 3 bindings for libfuse 3 with async I/O support";
|
||||
homepage = "https://github.com/libfuse/pyfuse3";
|
||||
license = licenses.lgpl2Plus;
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhiveapi";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "Pyhass";
|
||||
repo = "Pyhiveapi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QBn+yKZN461npdhGngTnFeewE40dPZ+5TkUf5Xacajk=";
|
||||
hash = "sha256-H/FxFv+1dOeJqnLZ0urDJfysYZHybeTJdQkjAFghTeI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,30 +1,50 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, chameleon
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, pyramid
|
||||
, zope_interface
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, zope_interface
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyramid_chameleon";
|
||||
pname = "pyramid-chameleon";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d176792a50eb015d7865b44bd9b24a7bd0489fa9a5cebbd17b9e05048cef9017";
|
||||
pname = "pyramid_chameleon";
|
||||
inherit version;
|
||||
sha256 = "sha256-0XZ5KlDrAV14ZbRL2bJKe9BIn6mlzrvRe54FBIzvkBc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Pylons/pyramid_chameleon/pull/25
|
||||
./test-renderers-pyramid-import.patch
|
||||
# Compatibility with pyramid 2, https://github.com/Pylons/pyramid_chameleon/pull/34
|
||||
(fetchpatch {
|
||||
name = "support-later-limiter.patch";
|
||||
url = "https://github.com/Pylons/pyramid_chameleon/commit/36348bf4c01f52c3461e7ba4d20b1edfc54dba50.patch";
|
||||
sha256 = "sha256-cPS7JhcS8nkBS1T0OdZke25jvWHT0qkPFjyPUDKHBGU=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ chameleon pyramid zope_interface setuptools ];
|
||||
propagatedBuildInputs = [
|
||||
chameleon
|
||||
pyramid
|
||||
setuptools
|
||||
zope_interface
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyramid_chameleon" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyramid_chameleon"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
|
||||
@ -3,23 +3,54 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, webtest
|
||||
, markupsafe
|
||||
, jinja2
|
||||
, pytestCheckHook
|
||||
, zope_deprecation
|
||||
, pyramid
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyramid_jinja2";
|
||||
pname = "pyramid-jinja2";
|
||||
version = "2.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI=";
|
||||
pname = "pyramid_jinja2";
|
||||
inherit version;
|
||||
hash = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI=";
|
||||
};
|
||||
|
||||
buildInputs = [ webtest ];
|
||||
propagatedBuildInputs = [ jinja2 pyramid ];
|
||||
propagatedBuildInputs = [
|
||||
markupsafe
|
||||
jinja2
|
||||
pyramid
|
||||
zope_deprecation
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyramid_jinja2" ];
|
||||
checkInputs = [
|
||||
webtest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyramid_jinja2"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError: Lists differ: ['pyramid_jinja2-2.10',...
|
||||
"test_it_relative_to_package"
|
||||
# AssertionError: False is not true
|
||||
"test_options"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysnmplib";
|
||||
version = "5.0.15";
|
||||
version = "5.0.16";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "pysnmp";
|
||||
repo = "pysnmp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9HkS8oY9aHr8jXmryUMNz3z36BMWeYMuXLKdpEzCgZc=";
|
||||
hash = "sha256-TmH4lvlgShEbhpBFEpgGJWLR2k1TmT2MhV2bgYWt9vo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "regenmaschine";
|
||||
version = "2022.05.0";
|
||||
version = "2022.05.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8tc/7XaHqgnuQgQc1ZlkoiBnl/d+OKKXjKNWwY+vCaU=";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-E66qs8EC5o2WNMlv8ITK98De639wwhscbSFjljDzrks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,21 +1,38 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pytest, mock }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "verboselogs";
|
||||
version = "1.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xolox";
|
||||
repo = "python-verboselogs";
|
||||
rev = version;
|
||||
sha256 = "10jzm8pkl49as4y2zyiidmfqqj5zmqg3p73jvx4lfxi0gmp1vhl5";
|
||||
hash = "sha256-hcIdbn0gdkdJ33KcOx6uv0iMXW0x+i880SoROi+qX4I=";
|
||||
};
|
||||
|
||||
# do not run pylint plugin test, as astroid is a old unsupported version
|
||||
checkPhase = ''
|
||||
PATH=$PATH:$out/bin pytest . -k "not test_pylint_plugin"
|
||||
'';
|
||||
checkInputs = [ pytest mock ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"verboselogs"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Do not run pylint plugin test
|
||||
"test_pylint_plugin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Verbose logging for Python's logging module";
|
||||
|
||||
@ -1,25 +1,41 @@
|
||||
{ buildPythonPackage, fetchFromGitHub, lib, isPy27, webtest, invoke, flake8
|
||||
, aiohttp, pytest-aiohttp, pytestCheckHook }:
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, webtest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "webtest-aiohttp";
|
||||
version = "2.0.0";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sloria";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1apr1x0wmnc6l8wv67z4dp00fiiygda6rwpxlspfk7nk9zz37q2j";
|
||||
sha256 = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
webtest
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
pytest-aiohttp
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"webtest_aiohttp"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ webtest ];
|
||||
checkInputs = [ invoke flake8 aiohttp pytest-aiohttp pytestCheckHook ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Provides integration of WebTest with aiohttp.web applications";
|
||||
homepage = "https://github.com/sloria/webtest-aiohttp";
|
||||
|
||||
@ -32,14 +32,14 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1174";
|
||||
version = "2.0.1175";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-gQuMdI4KCLQp52T9z+zxnjmKFPh97NrKSY9dgNm+6/c=";
|
||||
hash = "sha256-nLh00DaSpKT6rngiXKa6z0+Ouu1/hMWzIYa54PHPD1k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
|
||||
buildFlagsArray+=("LIBS=-lXaw -lXext -lSM -lICE -lXmu -lXt -lX11 -lncurses")
|
||||
'';
|
||||
|
||||
# Workaround build failure on -fno-common toolchains like upstream
|
||||
# gcc-10. Otherwise build fails as:
|
||||
# ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of
|
||||
# `mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here
|
||||
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
installPhase = ''
|
||||
# the makefile doesn't have a sensible install target, so we hav to do it ourselves
|
||||
mkdir -p $out/bin
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
, docutils, meson, ninja, pkg-config, python3
|
||||
# Runtime depends
|
||||
, glfw, SDL2, SDL2_mixer
|
||||
, freetype, libpng, libwebp, libzip, zlib
|
||||
, cglm, freetype, libpng, libwebp, libzip, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taisei";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz";
|
||||
sha256 = "11f9mlqmzy1lszwcc1nsbar9q1hs4ml6pbm52hqfd4q0f4x3ln46";
|
||||
sha256 = "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
glfw SDL2 SDL2_mixer
|
||||
freetype libpng libwebp libzip zlib
|
||||
cglm freetype libpng libwebp libzip zlib
|
||||
];
|
||||
|
||||
patches = [ ./0001-lto-fix.patch ];
|
||||
@ -44,4 +44,3 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
version = "2021-04-21";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz";
|
||||
url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz";
|
||||
sha256 = "sha256-8ysWT3X3rIyUAo4/QbkX7cQq5iFeU18/BPsmmWugcIc=";
|
||||
};
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tile38";
|
||||
version = "1.27.1";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tidwall";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CT611ZQmUYb6AclDEWXQsKDNxpwdJ+jqxIdDKGRo4/Q=";
|
||||
sha256 = "sha256-Kac0iNqJFLLRR+Xu5GlxrsQqvim60uDlToe883++/7g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FeQbfnvdERg5jtiTaT7Uz1YvmYLDXCDEf4sAyr3+Avk=";
|
||||
vendorSha256 = "sha256-/7dDPUXutyzkWq6EVVINFKzhuaiBCv5GrAF5pWG3ikc=";
|
||||
|
||||
subPackages = [ "cmd/tile38-cli" "cmd/tile38-server" ];
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cfripper";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xDLzxe8lelHMU58SaThQ2NSfWDZ0DCYSHkiLPifxQGw=";
|
||||
hash = "sha256-f/oZ7ZN2WT0a290Cq1w8O4Yggo1YV5k1tiTAm5ulVdI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -32732,6 +32732,8 @@ with pkgs;
|
||||
|
||||
aragorn = callPackage ../applications/science/biology/aragorn { };
|
||||
|
||||
astral = callPackage ../applications/science/biology/astral { };
|
||||
|
||||
archimedes = callPackage ../applications/science/electronics/archimedes {
|
||||
stdenv = gcc6Stdenv;
|
||||
};
|
||||
|
||||
@ -1293,9 +1293,6 @@ let
|
||||
|
||||
rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { };
|
||||
|
||||
ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { };
|
||||
ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { };
|
||||
|
||||
resto = callPackage ../development/ocaml-modules/resto { };
|
||||
resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { };
|
||||
resto-cohttp = callPackage ../development/ocaml-modules/resto/cohttp.nix { };
|
||||
|
||||
@ -4043,6 +4043,8 @@ in {
|
||||
|
||||
hupper = callPackage ../development/python-modules/hupper { };
|
||||
|
||||
huum = callPackage ../development/python-modules/huum { };
|
||||
|
||||
hvac = callPackage ../development/python-modules/hvac { };
|
||||
|
||||
hvplot = callPackage ../development/python-modules/hvplot { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user