Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rpm: 4.15.1 -> 4.16.1.2 #107126

Merged
merged 1 commit into from Dec 26, 2020
Merged

rpm: 4.15.1 -> 4.16.1.2 #107126

merged 1 commit into from Dec 26, 2020

Conversation

rb2k
Copy link
Contributor

@rb2k rb2k commented Dec 18, 2020 •
edited

Looking at http://rpm.org/timeline, 4.16.1.2 is the newest release.

With 4.16 the NDB backend was "promoted to stable", so I also enabled it in our builds.
NDB is included in the rpm codebase, so no additional dependencies for that . It just required a few small changes to compile on macOS.

sqlite will be the default for e.g. fedora 33 (https://fedoraproject.org/wiki/Changes/Sqlite_Rpmdb), so I also enable it as a backend. Without these two, the resulting binary won't be able to read the majority of rpm DBs in the near future, so it seems like a sane default.

Also, as you can see, enabling these two doesn't change the default backend when not specified otherwise. It's still bdb:

mseeger@mseeger-mbp nixpkgs % /nix/store/x0kafl4cqlng73v9px04y1x7dww52cqq-rpm-4.16.1.2/bin/rpm --eval '%_db_backend'
bdb
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@rb2k
Copy link
Contributor Author

rb2k commented Dec 18, 2020 •
edited

Running "nixpkgs-review pr 107126" on my linux box: the only 3 things failing are missing downloads, so those should be broken in master as well.

$ nix-env -f /home/marc/.cache/nixpkgs-review/pr-107126/nixpkgs -qaP --xml --out-path --show-trace --meta
57 packages updated:
aliza aucdtect bluejeans clair clickshare-csc1 clmagma createrepo_c cups-gutenprint-binary Dell diamond diffoscope doodle drawio dtrx ec2-utils epm epson epson-inkjet-printer-workforce epson_201207w flatpak-builder gnunet gnunet-gtk hpmyroom hydra intel-ocl iscan libextractor libmodulemd libmodulemd libmodulemd libmodulemd libsane-dsseries libsolv megacli mkl nice-dcv-client nix-template-rpm perl5.30.3-RPM2 perl5.32.0-RPM2 postscript-lexmark python3.7-mkl-service python3.7-osc python3.8-mkl-service python3.8-osc python3.9-mkl-service python3.9-osc python38Packages.rpm (4.15.1 → 4.16.1.2) python37Packages.rpm (4.15.1 → 4.16.1.2) python39Packages.rpm (4.15.1 → 4.16.1.2) rpm (4.15.1 → 4.16.1.2) rpm-ostree rpmextract scaleft snowsql vdr-xineliboutput vk-messenger yandex-disk

$ nix --experimental-features nix-command build --no-link --keep-going --option build-use-sandbox relaxed -f /home/marc/.cache/nixpkgs-review/pr-107126/build.nix
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix
builder for '/nix/store/w8l2wyy84x4678p3ak3kd9jahp7aq3zm-aliza.rpm.drv' failed with exit code 1; last 7 log lines:
  
  trying https://drive.google.com/uc?export=download&id=1nggavPhY_633T-AW9PdkcAgbWtzv3QKG
    % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                   Dload  Upload   Total   Spent    Left  Speed
    0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  curl: (22) The requested URL returned error: 404 
  error: cannot download aliza.rpm from any mirror
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix
builder for '/nix/store/40bmlpyjsczfaisp2n6gx412j00shdhp-aucdtect-0.8-2.i586.rpm.drv' failed with exit code 1; last 10 log lines:
  Warning: Problem : timeout. Will retry in 1 seconds. 3 retries left.
    0     0    0     0    0     0      0      0 --:--:--  0:02:10 --:--:--     0
  curl: (28) Failed to connect to www.true-audio.com port 80: Connection timed out
  Warning: Problem : timeout. Will retry in 2 seconds. 2 retries left.
    0     0    0     0    0     0      0      0 --:--:--  0:02:11 --:--:--     0
  curl: (28) Failed to connect to www.true-audio.com port 80: Connection timed out
  Warning: Problem : timeout. Will retry in 4 seconds. 1 retries left.
    0     0    0     0    0     0      0      0 --:--:--  0:02:11 --:--:--     0
  curl: (28) Failed to connect to www.true-audio.com port 80: Connection timed out
  error: cannot download aucdtect-0.8-2.i586.rpm from any mirror
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix
builder for '/nix/store/j53rvaij45cz3sidjc0inrvqlfviqmlp-diamond_3_10-base_x64-111-2-x86_64-linux.rpm.drv' failed with exit code 1; last 10 log lines:
  ***
  Unfortunately, we cannot download file diamond_3_10-base_x64-111-2-x86_64-linux.rpm automatically.
  Please go to http://www.latticesemi.com/view_document?document_id=52180 to download it yourself, and add it to the Nix store
  using either
    nix-store --add-fixed sha256 diamond_3_10-base_x64-111-2-x86_64-linux.rpm
  or
    nix-prefetch-url --type sha256 file:///path/to/diamond_3_10-base_x64-111-2-x86_64-linux.rpm
  
  ***
  
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix
1 dependencies of derivation '/nix/store/v0pczqj8dc4sv2fxcqrkqqym6zaq69i0-aliza-1.98.32.drv' failed to build
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix
1 dependencies of derivation '/nix/store/3jfcvjlbsmvjs0bbbm9jdc9yi7qj96b5-aucdtect-0.8-2.drv' failed to build
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix
1 dependencies of derivation '/nix/store/inw22di8lk8z5ak77fr8rxk94wcfqa7s-diamond-3.10.drv' failed to build
error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix
3 dependencies of derivation '/nix/store/fdrc6lk6dkz9cw25vr2c8pmpz0nmv55v-env.drv' failed to build

Link to currently reviewing PR:
https://github.com/NixOS/nixpkgs/pull/107126

3 packages failed to build:
aliza aucdtect lattice-diamond

53 packages built:
bluejeans-gui clair clickshare-csc1 clmagma createrepo_c dell-530cdn diffoscope doodle drawio dsseries dtrx ec2-utils epkowa epm epson-201106w epson-workforce-635-nx625-series epson_201207w flatpak-builder gnunet gnunet-gtk gutenprintBin hpmyroom hydra-unstable intel-ocl libextractor libmodulemd libsolv megacli mkl nice-dcv-client nix-template-rpm perl530Packages.RPM2 perl532Packages.RPM2 postscript-lexmark python37Packages.libmodulemd python37Packages.mkl-service python37Packages.osc python37Packages.rpm python38Packages.libmodulemd python38Packages.mkl-service python38Packages.osc rpm python39Packages.libmodulemd python39Packages.mkl-service python39Packages.osc python39Packages.rpm rpm-ostree rpmextract scaleft snowsql vdrPlugins.xineliboutput vk-messenger yandex-disk

@rb2k
Copy link
Contributor Author

rb2k commented Dec 18, 2020

@GrahamcOfBorg build rpm

@rb2k rb2k marked this pull request as draft December 18, 2020 15:38
@rb2k rb2k marked this pull request as ready for review December 18, 2020 15:38
@makefu
Copy link
Contributor

makefu commented Dec 18, 2020

@GrahamcOfBorg build rpm

@rb2k
Copy link
Contributor Author

rb2k commented Dec 18, 2020

Result of nixpkgs-review pr 107126 run on x86_64-darwin 1

4 packages failed to build:
  • diffoscope
  • python37Packages.osc
  • python38Packages.osc
  • python39Packages.osc
10 packages built:
  • clair
  • dell-530cdn
  • ec2-utils
  • epm
  • libsolv
  • nix-template-rpm
  • python37Packages.rpm
  • rpm (python38Packages.rpm)
  • python39Packages.rpm
  • rpmextract

@rb2k
Copy link
Contributor Author

rb2k commented Dec 18, 2020

Result of nixpkgs-review pr 107126 run on x86_64-linux 1

3 packages failed to build:
  • aliza
  • aucdtect
  • lattice-diamond
53 packages built:
  • bluejeans-gui
  • clair
  • clickshare-csc1
  • clmagma
  • createrepo_c
  • dell-530cdn
  • diffoscope
  • doodle
  • drawio
  • dsseries
  • dtrx
  • ec2-utils
  • epkowa
  • epm
  • epson-201106w
  • epson-workforce-635-nx625-series
  • epson_201207w
  • flatpak-builder
  • gnunet
  • gnunet-gtk
  • gutenprintBin
  • hpmyroom
  • hydra-unstable
  • intel-ocl
  • libextractor
  • libmodulemd
  • libsolv
  • megacli
  • mkl
  • nice-dcv-client
  • nix-template-rpm
  • perl530Packages.RPM2
  • perl532Packages.RPM2
  • postscript-lexmark
  • python37Packages.libmodulemd
  • python37Packages.mkl-service
  • python37Packages.osc
  • python37Packages.rpm
  • python38Packages.libmodulemd
  • python38Packages.mkl-service
  • python38Packages.osc
  • rpm (python38Packages.rpm)
  • python39Packages.libmodulemd
  • python39Packages.mkl-service
  • python39Packages.osc
  • python39Packages.rpm
  • rpm-ostree
  • rpmextract
  • scaleft
  • snowsql
  • vdrPlugins.xineliboutput
  • vk-messenger
  • yandex-disk

@makefu
Copy link
Contributor

makefu commented Dec 18, 2020

x86_64-darwin

all packages currently do not build on master:

~ hydra-check --channel master  diffoscope --arch x86_64-darwin --short
Build Status for diffoscope.x86_64-darwin on master
✖ (Dependency failed) diffoscope-163 from 2020-12-12 - https://hydra.nixos.org/build/132755775

~ hydra-check --channel master  python38Packages.osc --arch x86_64-darwin --short
Build Status for python38Packages.osc.x86_64-darwin on master
✖ (Failed) python3.8-osc-0.170.0 from 2020-12-11 - https://hydra.nixos.org/build/132700478

means that nothing new broke 👍

@makefu
Copy link
Contributor

makefu commented Dec 18, 2020

x86_64-linux

these packages do not seem to be in the current jobset of hydra:

$ hydra-check --channel master  aliza --url  
https://hydra.nixos.org/job/nixpkgs/trunk/aliza.x86_64-linux

haven't checked why though?

@rb2k
Copy link
Contributor Author

rb2k commented Dec 18, 2020

All of the broken projects have bad URLs for their code repos.
Either google drive links or domains that don't respond.

makefu
makefu approved these changes Dec 18, 2020
View reviewed changes
Copy link
Contributor

@makefu makefu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@ofborg ofborg bot requested a review from copumpkin December 19, 2020 23:17
@rb2k
Copy link
Contributor Author

rb2k commented Dec 21, 2020

Moved the substituteinplace to an actual patch file for darwin.

@rb2k
Copy link
Contributor Author

rb2k commented Dec 21, 2020 •
edited

Upstream PR for adding darwin support to NDB/rpm: rpm-software-management/rpm#1465

Let me update this PR with the upstream patch

(and retest to make sure)

@makefu
Copy link
Contributor

makefu commented Dec 21, 2020

looks great now! Thanks

@Conan-Kudo
Copy link

@rb2k I would suggest enabling SQLite rpmdb because Fedora 33 uses SQLite RPMDB, and it would be pretty much impossible to read an archived rpmdb from these operating systems without support.

@rb2k
Copy link
Contributor Author

rb2k commented Dec 22, 2020

Ok, @Conan-Kudo is right.

I simplified the patch (based on feedback from the RPM pull request) and added sqlite next to NDB.

@rb2k
Copy link
Contributor Author

rb2k commented Dec 22, 2020

Result of nixpkgs-review pr 107126 run on x86_64-darwin 1

1 package marked as broken and skipped:
  • dtrx
4 packages failed to build:
  • diffoscope
  • python37Packages.osc
  • python38Packages.osc
  • python39Packages.osc
11 packages built:
  • clair
  • epm
  • libmodulemd
  • libsolv
  • python37Packages.libmodulemd
  • python37Packages.rpm
  • python38Packages.libmodulemd
  • rpm (python38Packages.rpm)
  • python39Packages.libmodulemd
  • python39Packages.rpm
  • rpmextract

@rb2k
Copy link
Contributor Author

rb2k commented Dec 22, 2020

Ok, same failures as @makefu already pointed out in master previously (#107126 (comment))

@rb2k
Copy link
Contributor Author

rb2k commented Dec 22, 2020

Result of nixpkgs-review pr 107126 run on x86_64-linux 1

3 packages failed to build:
  • aliza
  • aucdtect
  • lattice-diamond
52 packages built:
  • bluejeans-gui
  • clair
  • clickshare-csc1
  • clmagma
  • createrepo_c
  • dell-530cdn
  • diffoscope
  • doodle
  • drawio
  • dsseries
  • dtrx
  • ec2-utils
  • epkowa
  • epm
  • epson-201106w
  • epson-workforce-635-nx625-series
  • epson_201207w
  • flatpak-builder
  • gnunet
  • gnunet-gtk
  • gutenprintBin
  • hpmyroom
  • hydra-unstable
  • intel-ocl
  • libextractor
  • libmodulemd
  • libsolv
  • megacli
  • mkl
  • nice-dcv-client
  • perl530Packages.RPM2
  • perl532Packages.RPM2
  • postscript-lexmark
  • python37Packages.libmodulemd
  • python37Packages.mkl-service
  • python37Packages.osc
  • python37Packages.rpm
  • python38Packages.libmodulemd
  • python38Packages.mkl-service
  • python38Packages.osc
  • rpm (python38Packages.rpm)
  • python39Packages.libmodulemd
  • python39Packages.mkl-service
  • python39Packages.osc
  • python39Packages.rpm
  • rpm-ostree
  • rpmextract
  • scaleft
  • snowsql
  • vdrPlugins.xineliboutput
  • vk-messenger
  • yandex-disk

@rb2k rb2k requested a review from Mic92 December 22, 2020 18:11
@rb2k rb2k requested a review from Mic92 December 23, 2020 00:12
@Mic92 Mic92 merged commit 80418f6 into NixOS:master Dec 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@makefu makefu makefu approved these changes

@copumpkin copumpkin Awaiting requested review from copumpkin

@Mic92 Mic92 Awaiting requested review from Mic92

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rb2k @makefu @Conan-Kudo @Mic92 @SuperSandro2000