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.

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

glog: 0.6.0 -> 0.7.1 #289608

Closed
wants to merge 3 commits into from
Closed

glog: 0.6.0 -> 0.7.1 #289608

wants to merge 3 commits into from

Conversation

r-ryantm
Copy link
Contributor

Automatic update generated by nixpkgs-update tools. This update was made based on information from https://github.com/google/glog/releases.

meta.description for glog is: Library for application-level logging

meta.homepage for glog is: https://github.com/google/glog

Updates performed
  • Version update
To inspect upstream changes
Impact

Checks done


  • built on NixOS
  • The tests defined in passthru.tests, if any, passed
  • found 0.7.0 with grep in /nix/store/msbn00ykbswj5ri1q0avh8g5pdsv4z2n-glog-0.7.0
  • found 0.7.0 in filename of file in /nix/store/msbn00ykbswj5ri1q0avh8g5pdsv4z2n-glog-0.7.0

Rebuild report (if merged into master) (click to expand)
2182 total rebuild path(s)

2182 package rebuild(s)

First fifty rebuilds by attrpath
ansible-doctor
apacheHttpdPackages.mod_tile
apacheHttpdPackages_2_4.mod_tile
arrow-cpp
arrow-glib
asn1editor
authentik
barman
beancount
breezy
brise
browsr
buck
buildbot
buildbot-full
buildbot-ui
cabal2nix
caffe
caffeWithCuda
calcurse
cantor
ceph
ceph-client
ceph-csi
ceph-dev
ceres-solver
certbot-full
cfripper
chatgpt-retrieval-plugin
cloudcompare
coconut
colmap
colmapWithCuda
conan
crackmapexec
csvkit
databricks-sql-cli
datalad
dbx
deface
deja-dup
dep2nix
devpi-client
dnstwist
dragonflydb
duplicity
duply
dvc
dvc-with-remotes
dwarfs
Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/msbn00ykbswj5ri1q0avh8g5pdsv4z2n-glog-0.7.0 \
  --option binary-caches 'https://cache.nixos.org/ https://nix-community.cachix.org/' \
  --option trusted-public-keys '
  nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(The Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the trusted-users list or you can use sudo since root is effectively trusted.

Or, build yourself:

nix-build -A glog https://github.com/r-ryantm/nixpkgs/archive/d851940e3c16fc1dde937e3608ef6eb10d4dbfe0.tar.gz

Or:

nix build github:r-ryantm/nixpkgs/d851940e3c16fc1dde937e3608ef6eb10d4dbfe0#glog

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/msbn00ykbswj5ri1q0avh8g5pdsv4z2n-glog-0.7.0
ls -la /nix/store/msbn00ykbswj5ri1q0avh8g5pdsv4z2n-glog-0.7.0/bin


Pre-merge build results

NixPkgs review skipped


Maintainer pings

cc @nh2 @r-burns for testing.

@marsam
Copy link
Contributor

marsam commented Mar 28, 2024

@GrahamcOfBorg eval

@wegank wegank marked this pull request as draft April 5, 2024 18:35
@r-ryantm r-ryantm changed the title glog: 0.6.0 -> 0.7.0 glog: 0.6.0 -> 0.7.1 Jun 13, 2024
@r-ryantm
Copy link
Contributor Author

Automatic update generated by nixpkgs-update tools. This update was made based on information from https://github.com/google/glog/releases.

meta.description for glog is: Library for application-level logging

meta.homepage for glog is: https://github.com/google/glog

Updates performed
  • Version update
To inspect upstream changes
Impact

Checks done


  • built on NixOS
  • The tests defined in passthru.tests, if any, passed
  • found 0.7.1 with grep in /nix/store/qlkrndcx0w5j2szzrvmp2rcc3map37x3-glog-0.7.1
  • found 0.7.1 in filename of file in /nix/store/qlkrndcx0w5j2szzrvmp2rcc3map37x3-glog-0.7.1

Rebuild report (if merged into master) (click to expand)
3334 total rebuild path(s)

3334 package rebuild(s)

First fifty rebuilds by attrpath

anki
ansible-doctor
apacheHttpdPackages.mod_tile
apacheHttpdPackages_2_4.mod_tile
arrow-cpp
arrow-glib
asn1editor
authentik
backgroundremover
barman
beancount
breezy
brise
browsr
buck
buildbot
buildbot-full
buildbot-ui
buildbotPackages.buildbot
buildbotPackages.buildbot-full
buildbotPackages.buildbot-ui
cabal2nix
caffe
caffeWithCuda
calcurse
cantor
ceph
ceph-client
ceph-csi
ceph-dev
ceres-solver
certbot-full
cfripper
chatgpt-retrieval-plugin
cloudcompare
coconut
colmap
colmapWithCuda
conan
crackmapexec
databricks-sql-cli
datalad
datatrove
dbx
deface
deja-dup
dep2nix
devpi-client
dnstwist
Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/qlkrndcx0w5j2szzrvmp2rcc3map37x3-glog-0.7.1 \
  --option binary-caches 'https://cache.nixos.org/ https://nix-community.cachix.org/' \
  --option trusted-public-keys '
  nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(The Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the trusted-users list or you can use sudo since root is effectively trusted.

Or, build yourself:

nix-build -A glog https://github.com/r-ryantm/nixpkgs/archive/8f4ecc04ffefa41e9b10ca6699431101d5894212.tar.gz

Or:

nix build github:r-ryantm/nixpkgs/8f4ecc04ffefa41e9b10ca6699431101d5894212#glog

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/qlkrndcx0w5j2szzrvmp2rcc3map37x3-glog-0.7.1
ls -la /nix/store/qlkrndcx0w5j2szzrvmp2rcc3map37x3-glog-0.7.1/bin


Pre-merge build results

NixPkgs review skipped


Maintainer pings

cc @nh2 @r-burns for testing.

@nh2
Copy link
Contributor

nh2 commented Jun 23, 2024

I started building the direct dependents of glog using:

nix-build --no-out-link $(nix-store -q --referrers $(nix-instantiate -A glog)) --keep-going

Failures:

folly-2024.03.11.00

In file included from /build/source/folly/CancellationToken-inl.h:23,
                 from /build/source/folly/CancellationToken.h:365,
                 from /build/source/folly/CancellationToken.cpp:17:
/nix/store/9y0cswrb58vw8vshmi14mrs4v9lqs25c-glog-0.7.1/include/glog/logging.h:60:4: error: #error <glog/logging.h> was not included correctly. See the documentation for how to consume the library.
   60 | #  error <glog/logging.h> was not included correctly. See the documentation for how to consume the library.
      |    ^~~~~

Looks like:

I commented there that AUR has a patch, applying that here fixes that.

It further needed this patch I made:

I pushed 2 patches into this PR that fixes those. I hope that works with r-ryantm's workflows.

Other failed packages

caffe-1.0
dwarfs-0.9.9
gnss-sdr-0.0.19.1
lomiri-download-manager-0.1.3
mir-2.15.0
natron-2.5.0
python3.11-opensfm-unstable-2023-12-09
python3.12-opensfm-unstable-2023-12-09
trust-store-2.0.2

Many of them have similar error messages as folly had.

See also:

@ofborg ofborg bot requested review from pierreis and abbradar June 23, 2024 15:25
@nh2
Copy link
Contributor

nh2 commented Jun 23, 2024

Running out of time; somebody else would have to take a look at the remaining build failures, please.

@superherointj
Copy link
Contributor

superherointj commented Oct 16, 2024

@nh2 My take on builds:

Taking as reference staging-next (I rebased this PR on it) because it's latest and I have cache for it:

Builds OK:

  • arrow-cpp
  • ceres-solver
  • dwarfs
  • mir

Builds with fix:

  • caffe:
      # File: pkgs/applications/science/math/caffe/default.nix
    postPatch = ''
      substituteInPlace CMakeLists.txt \
        --replace-fail "# ---[ Flags" \
                       "# ---[ Flags
        add_compile_definitions(GLOG_USE_GLOG_EXPORT)"
      '';
    
  • trust-store (lomiri.trust-store):
    # File: pkgs/desktops/lomiri/development/trust-store/default.nix
    postPatch = ''
      sed -i '17i add_compile_definitions(GLOG_USE_GLOG_EXPORT)' CMakeLists.txt
    '';
    
  • python3Packages.opensfm
    • Error:

      error <glog/logging.h> was not included correctly.
      staging-next logs: https://termbin.com/y0uz

    • Fix:
      # File: pkgs/development/python-modules/opensfm/default.nix
      postPatch = ''
        sed -i '47i add_compile_definitions(GLOG_USE_GLOG_EXPORT)' opensfm/src/CMakeLists.txt
      '';
      

Errors on master:

Blockers for this PR:

  • Apply caffe, trust-store fix.

@nh2
Copy link
Contributor

nh2 commented Oct 16, 2024

@superherointj Good finds for the fixes.

The sed -i 52i with offsets will not be very reliable if upstream changes.

Would it be possible to rewrite them with substituteInPlace with --replace-fail, so we can get a good error when upstream diverges so the patch no longer applies?

Thank you!

@superherointj
Copy link
Contributor

superherointj commented Oct 16, 2024

The sed -i 52i with offsets will not be very reliable if upstream changes.

Would it be possible to rewrite them with substituteInPlace with --replace-fail, so we can get a good error when upstream diverges so the patch no longer applies?

  • caffe:
    image

  • trust-store:
    image

  • python3Packages.opensfm
    image

FYI I don't have permission for pushing code to this PR and I can only suggest code here through human communication. I could open a new PR, but then, is it desirable? Likely not.

Alternatively, cherry-pick is available from:

Feel free to proceed as you wish.

@superherointj
Copy link
Contributor

Would be nice to have enabled:

outputs = [ "dev" "out" ]; # Saves on closure size

strictDeps = true; # Aids in cross compiling

@nh2
Copy link
Contributor

nh2 commented Oct 17, 2024

I could open a new PR, but then, is it desirable?

@superherointj That's totally fine, you can create a new PR, especially when iterating on @r-ryantm's PRs (who is a bot).

We can then close this PR in favour of yours.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 9, 2024
@Aleksanaa Aleksanaa closed this Dec 8, 2024
@r-ryantm r-ryantm deleted the auto-update/glog branch December 9, 2024 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants