Revert "Update sitediff manually to 1.2.0"

This reverts commit 2dc016e8c0.

As libcurl.so is missing
This commit is contained in:
Daniel Siepmann 2022-09-07 10:16:07 +02:00
parent 2dc016e8c0
commit 9bedce31b2
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
3 changed files with 34 additions and 52 deletions

View file

@ -1,39 +1,39 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
diffy (3.4.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
diffy (3.3.0)
ethon (0.15.0)
ffi (>= 1.15.0)
ffi (1.15.5)
mini_portile2 (2.8.0)
minitar (0.9)
nokogiri (1.13.8-x86_64-linux)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
pkg-config (1.4.9)
public_suffix (5.0.0)
public_suffix (3.1.1)
racc (1.6.0)
rainbow (3.1.1)
sitediff (1.2.0)
addressable (>= 2.5.2, < 2.9.0)
diffy (~> 3.4.0)
rainbow (3.0.0)
sitediff (1.1.1)
addressable (~> 2.5.2)
diffy (~> 3.3.0)
minitar (~> 0.9)
nokogiri (>= 1.13.6)
pkg-config (~> 1.4)
rainbow (~> 3.1.1)
thor (~> 1.2.1)
typhoeus (~> 1.4.0)
webrick (>= 1.7)
thor (1.2.1)
nokogiri (>= 1.10.4)
pkg-config (~> 1.1)
rainbow (~> 3.0.0)
thor (~> 0.20.0)
typhoeus (~> 1.0)
thor (0.20.3)
typhoeus (1.4.0)
ethon (>= 0.9.0)
webrick (1.7.0)
PLATFORMS
x86_64-linux
ruby
DEPENDENCIES
sitediff
BUNDLED WITH
2.3.7
2.1.4

View file

@ -4,22 +4,14 @@
bundlerApp,
bundlerUpdateScript,
makeWrapper,
ruby_3_1
ruby
}:
# 1. cd into this folder
# 2. start nix shell: nix-shell -p ruby_3_1 -p bundix
# 3. clean tings up: rm Gemfile.lock gemset.nix
# 4. Generate files again: bundle lock; bundix -l
# 5. Manually keep old sha256 hash of nokogiri dependency
# Issue seems to be platform specific "nokogiri (1.13.8-x86_64-linux)" which is not yet supported by gemset, leading to different versions and hashes
bundlerApp rec {
pname = "sitediff";
exes = [ "sitediff" ];
ruby = ruby_3_1;
inherit ruby;
gemdir = ./.;
buildInputs = [ makeWrapper ];

View file

@ -5,20 +5,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
type = "gem";
};
version = "2.8.1";
version = "2.5.2";
};
diffy = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qcsv29ljfhy76gq4xi8zpn6dc6nv15c41r131bdr38kwpxjzd1n";
sha256 = "0qhx743lcx61r2d3925jk61c6r8clfjmpf5g93cdy5sq00ig76lh";
type = "gem";
};
version = "3.4.2";
version = "3.3.0";
};
ethon = {
dependencies = ["ffi"];
@ -87,10 +87,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
type = "gem";
};
version = "5.0.0";
version = "3.1.1";
};
racc = {
groups = ["default"];
@ -107,31 +107,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
type = "gem";
};
version = "3.1.1";
version = "3.0.0";
};
sitediff = {
dependencies = ["addressable" "diffy" "minitar" "nokogiri" "pkg-config" "rainbow" "thor" "typhoeus" "webrick"];
dependencies = ["addressable" "diffy" "minitar" "nokogiri" "pkg-config" "rainbow" "thor" "typhoeus"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w72c6rnbzl6pn3500wh20gjhfkaxj3n4q2ycm562jq4k6dqjxj4";
sha256 = "1mq2cfhw3hci0rfgn9hqfgrw8mx2mggm5jknif4q7i08rzg4mi80";
type = "gem";
};
version = "1.2.0";
version = "1.1.1";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
type = "gem";
};
version = "1.2.1";
version = "0.20.3";
};
typhoeus = {
dependencies = ["ethon"];
@ -144,14 +144,4 @@
};
version = "1.4.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
type = "gem";
};
version = "1.7.0";
};
}