nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195194 from anthonyroussel/thrift_0_17_0

Browse Source 
thrift,rubyPackages.thrift: 0.16.0 -> 0.17.0
This commit is contained in:
Robert Scott 2022-10-10 03:33:40 +01:00 committed by GitHub
commit 94716867c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/thrift/default.nix
View File

@ -16,11 +16,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "thrift"; pname = "thrift";
version = "0.16.0"; version = "0.17.0";
src = fetchurl { src = fetchurl {
url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk="; hash = "sha256-snLBeIuxZdmVIaJZmzG5f6aeWTHQmQFdka4QegsMxY8=";
}; };
# Workaround to make the Python wrapper not drop this package: # Workaround to make the Python wrapper not drop this package:
@ -61,11 +61,6 @@ stdenv.mkDerivation rec {
# ToStringTest.cpp is failing from some reason due to locale issue, this # ToStringTest.cpp is failing from some reason due to locale issue, this
# doesn't disable all UnitTests as in Darwin. # doesn't disable all UnitTests as in Darwin.
./disable-failing-test.patch ./disable-failing-test.patch
(fetchpatch {
name = "tests-expired-certs.diff"; # https://github.com/apache/thrift/pull/2629
url = "https://github.com/apache/thrift/commit/54765854873e19b8ba50a0ec8080dd92d8323851.diff";
sha256 = "wnG2MjY0DtAhVcEdcxu77tDa4T9Xm2pMYZU2wXLx2OA=";
})
(fetchpatch { (fetchpatch {
name = "setuptools-gte-62.1.0.patch"; # https://github.com/apache/thrift/pull/2635 name = "setuptools-gte-62.1.0.patch"; # https://github.com/apache/thrift/pull/2635
url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff"; url = "https://github.com/apache/thrift/commit/c41ad9d5119e9bdae1746167e77e224f390f2c42.diff";

4
pkgs/top-level/ruby-packages.nix
View File

@ -3038,10 +3038,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh"; sha256 = "sha256-AM0pP5ZafGRLF4/+BUsuA6DuNNc4wX2/OsTZeL4p6Io=";
type = "gem"; type = "gem";
}; };
version = "0.16.0"; version = "0.17.0";
}; };
tilt = { tilt = {
groups = ["default"]; groups = ["default"];