Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-07-04 00:01:25 +00:00 committed by GitHub
commit af65e88cc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 83 additions and 25 deletions

View file

@ -10644,6 +10644,12 @@
github = "totoroot";
githubId = 39650930;
};
ToxicFrog = {
email = "toxicfrog@ancilla.ca";
github = "ToxicFrog";
githubId = 90456;
name = "Rebecca (Bex) Kelly";
};
travisbhartwell = {
email = "nafai@travishartwell.net";
github = "travisbhartwell";

View file

@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
version = "3.4.1";
version = "3.6.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
sha256 = "sha256-f8P4UdqbzXxQU+zQnyGqPrYQO+mKbFj1IBC28iF0lB4=";
sha256 = "sha256:0f8aqwkgw4gs97b5i4ygiqk5zilwq7ax7zwdd31r72zk98cd1g46";
};
nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "curaengine";
version = "4.9.1";
version = "4.10.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
sha256 = "sha256-1hCjtnI1EnfyQ0QfU8qZoSLIjE5pyDYpu8H4J91cWYM=";
sha256 = "sha256-t5i6s0KKcaoMqzDxZ6JL1NyKP33uxWdmyziK3xh8q88=";
};
nativeBuildInputs = [ cmake ];

View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hijri-converter";
version = "2.1.2";
version = "2.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "43b5ac566e7a7deeab364a2397e94405a65fd24ea786073eb3d4c740ebda7b9b";
sha256 = "1cq67v0fjk7cd8kbppg2kl31a5i6jm8qrkcdqxx6vxwmx65l68ks";
};
checkInputs = [ pytestCheckHook ];

View file

@ -9,26 +9,25 @@
buildPythonPackage rec {
pname = "textfsm";
version = "1.1.1";
version = "1.1.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a";
sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm";
};
patches = [
(fetchpatch {
# remove pytest-runner dependency
url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch";
sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0";
})
propagatedBuildInputs = [
six
future
];
propagatedBuildInputs = [ six future ];
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Python module for parsing semi-structured text into python tables";

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "token-bucket";
version = "0.2.0";
version = "0.3.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "falconry";
repo = pname;
rev = version;
sha256 = "0kv8j2ab4knvzik2di66bgjwjxdslm2i0hjy35kn9z0dazni585s";
sha256 = "0a703y2d09kvv2l9vq7vc97l4pi2wwq1f2hq783mbw2238jymb3m";
};
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
version = "0.29.1";
version = "0.30.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82";
sha256 = "0xdn8xakywms8gcacmjvx0ivv37i3vj1d41c8sjlnf1s13q3zv7k";
};
vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk";
vendorSha256 = "18w0wz3raysba99cxcc8pk4md9j438g4y2d2v2pk2l6qri9apscw";
doCheck = false;

View file

@ -33,14 +33,14 @@ let
in env.mkDerivation rec {
pname = "katago";
version = "1.9.0";
version = "1.9.1";
githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362";
src = fetchFromGitHub {
owner = "lightvector";
repo = "katago";
rev = "v${version}";
sha256 = "sha256-6J1UY05NweXLw8D4kOXG3KkCxJRsrQ9NBYWu2Xzu9JI=";
sha256 = "sha256-sAtPOqGe6fZ9mAtLdp80fTALXVkP9WdWQU2iTFGXe24=";
};
fakegit = writeShellScriptBin "git" "echo ${githash}";

View file

@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub, boost, cmake, git }:
stdenv.mkDerivation rec {
pname = "openttd-grfcodec";
version = "unstable-2021-03-10";
src = fetchFromGitHub {
owner = "OpenTTD";
repo = "grfcodec";
rev = "045774dee7cab1a618a3e0d9b39bff78a12b6efa";
sha256 = "0b4xnnkqc01d3r834lhkq744ymar6c8iyxk51wc4c7hvz0vp9vmy";
};
buildInputs = [boost];
nativeBuildInputs = [cmake git];
installPhase = ''
mkdir -p $out/bin
cp -a grfcodec grfid grfstrip nforenum $out/bin/
'';
meta = with lib; {
description = "Low-level (dis)assembler and linter for OpenTTD GRF files";
homepage = "http://openttd.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ ToxicFrog ];
};
}

View file

@ -0,0 +1,22 @@
{ stdenv, lib, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "openttd-nml";
version = "0.5.3";
src = fetchFromGitHub {
owner = "OpenTTD";
repo = "nml";
rev = version;
sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9";
};
propagatedBuildInputs = with python3Packages; [ply pillow];
meta = with lib; {
description = "Compiler for OpenTTD NML files";
homepage = "http://openttdcoop.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ ToxicFrog ];
};
}

View file

@ -21,7 +21,8 @@ with python3.pkgs; buildPythonApplication rec {
substituteInPlace pyproject.toml \
--replace 'click = "^7.0"' 'click = "*"' \
--replace 'docutils = "^0.16"' 'docutils = "*"' \
--replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"'
--replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' \
--replace 'token-bucket = "^0.2.0"' 'token-bucket = "*"'
'';
nativeBuildInputs = [

View file

@ -28969,6 +28969,8 @@ in
static = true;
};
};
openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {};
openttd-nml = callPackage ../games/openttd/nml.nix {};
opentyrian = callPackage ../games/opentyrian { };