diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-20 12:02:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-20 12:02:05 +0000 |
commit | 3202dd166c491b8389c130d80dde3a377f650741 (patch) | |
tree | f01981a4772ae7a89265dcf9f32ab04e45866053 /pkgs/development | |
parent | b53692cdc6c06881578f206239291326ed42a78c (diff) | |
parent | 578dd8d634f0a4666f7481f6ea9e578114da74f8 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/amdvlk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libwebsockets/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/ode/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/physics/yoda/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/node-packages/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/agate-sql/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/crate/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/earthly/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/ko/default.nix | 31 | ||||
-rw-r--r-- | pkgs/development/web/cypress/default.nix | 4 |
10 files changed, 67 insertions, 15 deletions
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 2ef3f3d3920b1..3978f380a3b6b 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2021.Q2.5"; + version = "2021.Q3.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "0NJoGk++SHt4dtoUj3UQeW4zFtwa7osczUr+vxi8DG8="; + sha256 = "HisJsG27UvVbe0w8zzZArqioQQRxfuK2TPEWggV3TNA="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index b6ef6fa49b218..151d4c7ee48f6 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -26,8 +26,12 @@ let NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; - postInstall = "rm -rf ${placeholder "out"}/share/libwebsockets-test-server"; - disallowedReferences = [ stdenv.cc.cc ]; # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o + postInstall = '' + rm -r ${placeholder "out"}/share/libwebsockets-test-server + ''; + + # $out/share/libwebsockets-test-server/plugins/libprotocol_*.so refers to crtbeginS.o + disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { description = "Light, portable C library for websockets"; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index d9c82f79bb35c..211821e084ccc 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "ode"; - version = "0.12"; + version = "0.16.2"; src = fetchurl { - url = "mirror://sourceforge/opende/ode-${version}.tar.bz2"; - sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5"; + url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; + sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj"; }; meta = with lib; { description = "Open Dynamics Engine"; - homepage = "https://sourceforge.net/projects/opende"; + homepage = "https://www.ode.org"; platforms = platforms.linux; license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index c5a83f782f468..9398c4d2f36ea 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -25,6 +25,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70="; excludes = [ "ChangeLog" ]; }) + # fix a minor bug + # https://gitlab.com/hepcedar/yoda/-/merge_requests/45 + (fetchpatch { + name = "yoda-fix-yodascale-for-gz.patch"; + url = "https://gitlab.com/hepcedar/yoda/-/commit/b03162aeaa2c99e38512ba6e4818d2e0a825b757.diff"; + sha256 = "sha256-IMuPalQ/GKcdJOKAlwE/IRWtxDdu0inoj+A9nbRl6Gs="; + }) ]; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 498f41bc1b3fd..1a1a8a9eb0b83 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -218,12 +218,12 @@ let # remove node_ name prefix (fetchpatch { url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch"; - sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh"; + sha256 = "sha256-ubUdF0q3l4xxqZ7f9EiQEUQzyqxi9Q6zsRPETHlfzh8="; }) # set meta platform (fetchpatch { url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch"; - sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n"; + sha256 = "0sif7803c9g6gjmmdniw5qxrq5igiz9nqdmdrcf1hxfi5x43a32h"; }) ]; }; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 890f44b4ad38e..68f166b3c7c51 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate sqlalchemy ]; + # crate is broken in nixpkgs, with SQLAlchemy > 1.3 + # Skip tests for now as they rely on it. + doCheck = false; + checkInputs = [ crate nose geojson ]; checkPhase = '' diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 07b9652e7753f..c4a698c5250a0 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -39,5 +39,11 @@ buildPythonPackage rec { description = "A Python client library for CrateDB"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # 2021-07-12 (@layus): Please unbreak when an update fixes compatibility + # with the version of SQLAlchemy in nixpkgs + # And also re-enable tests in pythonPackages.agate-sql. + # The version string below is intentionally split, so nixpkgs-update does + # not change it. That would make this warning pretty useless. + broken = assert version == "0.2"+"6.0"; true; }; } diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index b46a97df20a37..e806b502de861 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.17"; + version = "0.5.18"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-SuHHeO2KFjB3HbLv1ODBGaXzNaDi/FNPOGg/lX8JLJE="; + sha256 = "sha256-YY4scGRMuvyEpeEgvoJJsTtROl11hMyGr7vYBYvJY/w="; }; - vendorSha256 = "sha256-D62fG+T3G1W7xteSGlTtEkXbQfGAmBTYJeATH2CVtwY="; + vendorSha256 = "sha256-aDkaOycQ/wPybSH5fnJIGtCOh+KV0wEF+qinRQQIdm4="; buildFlagsArray = '' -ldflags= diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix new file mode 100644 index 0000000000000..4754a32db8254 --- /dev/null +++ b/pkgs/development/tools/ko/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +}: + +buildGoModule rec { + pname = "ko"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LoOXZY4uF7GSS3Dh/ozCsLJTxgmPmZZuEisJ4ShjCBc="; + }; + + vendorSha256 = null; + excludedPackages = "test"; + checkInputs = [ git ]; + preCheck = '' + git init + ''; + + meta = with lib; { + description = "A simple, fast container image builder for Go applications."; + homepage = "https://github.com/google/ko"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 811a63b0cef84..ff673658272e5 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.7.0"; + version = "8.0.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; + sha256 = "144mz37xhk7gkwhmf67q1h07f2biy5nnw78yb2syc7w28v48ng0z"; }; # don't remove runtime deps |