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

[staging-next] glibc: restore version passthru #123548

Merged
merged 2 commits into from May 18, 2021

Conversation

jonringer
Copy link
Contributor

Motivation for this change

downstream packages use the major.minor version
to determine ABI compatibility and paths which
do not depend on patch version

related: #123279

Things done
  • 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.

downstream packages use the major.minor version
to determine ABI compatibility and paths which
do not depend on patch version
@ofborg ofborg bot requested review from edolstra and Ma27 May 18, 2021 17:54
@jonringer jonringer changed the title glibc: restore version passthru [staging-next] glibc: restore version passthru May 18, 2021
@jonringer
Copy link
Contributor Author

cc @andir

@jonringer jonringer requested a review from andir May 18, 2021 18:18
@andir andir self-assigned this May 18, 2021
…evel"

The fix is no longer required with the restored passthru version.

This reverts commit 6020fe2.
Copy link
Member

@andir andir left a comment

Choose a reason for hiding this comment

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

LGTM!

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build elf-header

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 18, 2021

Result of nixpkgs-review pr 123548 at f453c8d run on x86_64-linux 1

1497 packages marked as broken and skipped:
  • SDL_sixel
  • adobe-reader
  • adoptopenjdk-hotspot-bin-13
  • adoptopenjdk-hotspot-bin-14
  • adoptopenjdk-jre-hotspot-bin-13
  • adoptopenjdk-jre-hotspot-bin-14
  • adoptopenjdk-jre-openj9-bin-13
  • adoptopenjdk-jre-openj9-bin-14
  • adoptopenjdk-openj9-bin-13
  • adoptopenjdk-openj9-bin-14
  • ...
35358 packages skipped due to time constraints:
  • AMB-plugins
  • AusweisApp2
  • CHOWTapeModel
  • CoinMP
  • DisnixWebService
  • EBTKS
  • EmptyEpsilon
  • FIL-plugins
  • Fabric (python38Packages.Fabric)
  • LAStools
  • ...
312 packages built successfully:
  • addOpenGLRunpath
  • alegreya-sans
  • alsa-topology-conf
  • alsa-ucm-conf
  • asciidoc
  • autoPatchelfHook
  • autoconf (autoconf271)
  • autoconf-archive
  • autoconf213
  • autoconf269
  • automake (automake116x)
  • automake115x
  • autoreconfHook
  • autoreconfHook269
  • bash-completion
  • bash-supergenpass
  • bearssl
  • bintools
  • bintoolsNoLibc (binutilsNoLibc)
  • binutils
  • binutils_nogold
  • cacert
  • check
  • clipp
  • commonsLogging
  • copyDesktopItems
  • cracklib
  • stdenv (gccStdenv)
  • dav1d
  • dcw-gmt
  • dieHook
  • dns-root-data
  • docbook_xsl (docbook-xsl-nons)
  • docbook-xsl-ns (docbook_xsl_ns)
  • docbook_sgml_dtd_41
  • docbook_xml_dtd_412
  • docbook_xml_dtd_42
  • docbook_xml_dtd_43
  • docbook_xml_dtd_44
  • docbook_xml_dtd_45
  • docutils (python38Packages.docutils)
  • enableGCOVInstrumentation
  • ensureNewerSourcesForZipFilesHook
  • essentia-extractor
  • expat
  • fet-sh
  • file
  • findXMLCatalogs
  • firecracker
  • fixDarwinDylibNames
  • fpp
  • fribidi
  • gcc
  • gdbm
  • getconf (unixtools.getconf)
  • getent (unixtools.getent)
  • getopt
  • gettext
  • git2cl
  • glibc_multi
  • glowing-bear
  • gnu-config
  • gnu-efi
  • gnugrep
  • m4 (gnum4)
  • python3 (gnuradioPackages.python ,python38 ,python38Packages.python ,sourcehut.python)
  • gperf
  • gradle-completion
  • graylogPlugins.dnsresolver
  • half
  • help2man
  • hostname (unixtools.hostname)
  • hunspellDicts.eu-es (hunspellDicts.eu_ES)
  • installShellFiles
  • intltool
  • itstool
  • jpegexiforient
  • kakounePlugins.kakoune-extra-filetypes
  • kakounePlugins.tabs-kak
  • kexectools
  • keyutils
  • kmod
  • ladspaH
  • libGL
  • libaio
  • libassuan
  • libcap_ng
  • libdatrie
  • libdeflate
  • libedit
  • libelf
  • libev
  • libffi
  • libglvnd
  • libgpgerror
  • libiconv
  • libksba
  • libmnl
  • libnfnetlink
  • libpaper
  • libpfm
  • libseccomp
  • libssh2
  • libsysprof-capture
  • libthai
  • libtool (libtool_2)
  • libuninameslist
  • libyaml
  • linenoise
  • linuxHeaders
  • locale (unixtools.locale)
  • logitech-udev-rules
  • lsb-release
  • lucene
  • lz4
  • lzo
  • makeWrapper
  • merriweather
  • meson
  • monoDLLFixer
  • mpvScripts.sponsorblock
  • mssql_jdbc
  • mysql2pgsql
  • nasm
  • ncurses (ncurses6)
  • netsurf.buildsystem
  • nettools
  • ninja
  • nix-zsh-completions
  • npth
  • nukeReferences
  • nv-codec-headers
  • octavePackages.writeRequiredOctavePackagesHook
  • opencl-headers
  • openresolv
  • openssl (openssl_1_1)
  • pantheon.elementary-redacted-script
  • pciutils
  • perl (perl532 ,perl532Packages.perl)
  • perl532Packages.CGI
  • perl532Packages.CGIFast
  • perl532Packages.CPANMetaCheck
  • perl532Packages.CaptureTiny
  • perl532Packages.ClassInspector
  • perl532Packages.EncodeLocale
  • perl532Packages.ExtUtilsConfig
  • perl532Packages.ExtUtilsInstallPaths
  • perl532Packages.FCGI
  • perl532Packages.FCGIProcManager
  • perl532Packages.FileListing
  • perl532Packages.FontTTF
  • perl532Packages.HTMLParser
  • perl532Packages.HTMLTagset
  • perl532Packages.HTTPCookies
  • perl532Packages.HTTPDaemon
  • perl532Packages.HTTPDate
  • perl532Packages.HTTPMessage
  • perl532Packages.HTTPNegotiate
  • perl532Packages.IOHTML
  • perl532Packages.IOString
  • perl532Packages.LWP (perl532Packages.LWPUserAgent)
  • perl532Packages.LWPMediaTypes
  • perl532Packages.LocaleGettext
  • perl532Packages.NetHTTP
  • perl532Packages.PathTiny
  • perl532Packages.SubUplevel
  • perl532Packages.TermReadKey
  • perl532Packages.TestDeep
  • perl532Packages.TestFatal
  • perl532Packages.TestNeeds
  • perl532Packages.TestNoWarnings
  • perl532Packages.TestRequiresInternet
  • perl532Packages.TestWarn
  • perl532Packages.TimeDate
  • perl532Packages.TryTiny
  • perl532Packages.URI
  • perl532Packages.WWWRobotRules
  • perl532Packages.XMLNamespaceSupport
  • perl532Packages.XMLParser
  • perl532Packages.XMLSAX
  • perl532Packages.XMLSAXBase
  • pkg-config
  • pkg-config-unwrapped
  • popt
  • postgresql_jdbc
  • pruneLibtoolFiles
  • python38Packages.alabaster
  • python38Packages.appdirs
  • python38Packages.async-timeout
  • python38Packages.atomicwrites
  • python38Packages.attrs
  • python38Packages.bootstrapped-pip
  • python38Packages.certifi
  • python38Packages.colorama
  • python38Packages.coverage
  • python38Packages.dateutil (python38Packages.python-dateutil)
  • python38Packages.filelock
  • python38Packages.imagesize
  • python38Packages.importlib-metadata
  • python38Packages.iniconfig
  • python38Packages.libxml2
  • python38Packages.libxslt
  • python38Packages.linecache2
  • python38Packages.markupsafe
  • python38Packages.mock
  • python38Packages.more-itertools
  • python38Packages.nose
  • python38Packages.packaging
  • python38Packages.pbr
  • python38Packages.pexpect
  • python38Packages.pip
  • python38Packages.pipBuildHook
  • python38Packages.pipInstallHook
  • python38Packages.pkgconfig
  • python38Packages.pluggy
  • python38Packages.pretend
  • python38Packages.psutil
  • python38Packages.ptyprocess
  • python38Packages.py
  • python38Packages.pycodestyle
  • python38Packages.pyflakes
  • python38Packages.pygments
  • python38Packages.pyparsing
  • python38Packages.pysocks
  • python38Packages.pythonCatchConflictsHook
  • python38Packages.pythonImportsCheckHook
  • python38Packages.pythonNamespacesHook
  • python38Packages.pythonRemoveBinBytecodeHook (python39Packages.pythonRemoveBinBytecodeHook)
  • python38Packages.pythonRemoveTestsDirHook
  • python38Packages.pytz
  • python38Packages.recursivePthLoader
  • python38Packages.semantic-version
  • python38Packages.setuptools
  • python38Packages.setuptools-rust
  • python38Packages.setuptools-scm (python38Packages.setuptools_scm)
  • python38Packages.setuptoolsBuildHook
  • python38Packages.setuptoolsCheckHook
  • python38Packages.six
  • python38Packages.sortedcontainers
  • python38Packages.sphinxcontrib-applehelp
  • python38Packages.sphinxcontrib-devhelp
  • python38Packages.sphinxcontrib-htmlhelp
  • python38Packages.sphinxcontrib-jsmath
  • python38Packages.sphinxcontrib-qthelp
  • python38Packages.sphinxcontrib-serializinghtml
  • python38Packages.sphinxcontrib-websupport
  • python38Packages.testpath
  • python38Packages.toml
  • python38Packages.traceback2
  • python38Packages.unittest2
  • python38Packages.wcwidth
  • python38Packages.wheel
  • python38Packages.wheelUnpackHook
  • python38Packages.wrapPython
  • python38Packages.zipp
  • python39Packages.pythonNamespacesHook
  • python39Packages.pythonRemoveTestsDirHook
  • rapidxml
  • re2c
  • readline (readline6 ,readline63)
  • readline70
  • readline81
  • removeReferencesTo
  • rhash
  • runningx
  • setJavaClassPath
  • setupDebugInfoDirs
  • sjasmplus
  • smarty3-i18n
  • sqlite
  • stdenvNoCC
  • system-sendmail
  • teck-udev-rules
  • tests.install-shell-files.install-completion-output
  • tmuxPlugins.fpp
  • tmuxPlugins.net-speed
  • tmuxPlugins.sysstat
  • tmuxPlugins.tilish
  • tnt
  • tzdata
  • unicode-character-database
  • unixtools.netstat
  • unzip
  • updateAutotoolsGnuConfigScriptsHook
  • uthash
  • validatePkgConfig
  • vscode-extensions.cmschuetz12.wal
  • vscode-extensions.dhall.vscode-dhall-lsp-server
  • vscode-extensions.foxundermoon.shell-format
  • vscode-extensions.usernamehw.errorlens
  • waf
  • wafHook
  • which
  • xhtml1
  • xkeyboard_config (xorg.xkeyboardconfig)
  • xmlformat
  • xorg.libICE
  • xorg.libX11
  • xorg.libXau
  • xorg.libXdmcp
  • xorg.libXext
  • xorg.libXfixes
  • xorg.libXrender
  • xorg.libpthreadstubs
  • xorg.libxcb
  • xorg.utilmacros
  • xorg.xcbproto
  • xorg.xcbutil
  • xorg.xorgproto
  • xorg.xtrans
  • xxHash
  • zenstates

Result of nixpkgs-review pr 123548 at 990cc7f run on aarch64-linux 1

1620 packages marked as broken and skipped:
  • Literate
  • OVMF-CSM
  • SDL_sixel
  • acl2
  • adoptopenjdk-hotspot-bin-13
  • adoptopenjdk-hotspot-bin-14
  • adoptopenjdk-jre-hotspot-bin-13
  • adoptopenjdk-jre-hotspot-bin-14
  • agdaPackages.iowa-stdlib
  • aldor
  • ...
30238 packages skipped due to time constraints:
  • AMB-plugins
  • AusweisApp2
  • CHOWTapeModel
  • CoinMP
  • DisnixWebService
  • EBTKS
  • EmptyEpsilon
  • FIL-plugins
  • Fabric (python38Packages.Fabric)
  • LAStools
  • ...
258 packages built successfully:
  • alsa-topology-conf
  • alsa-ucm-conf
  • asciidoc
  • audit
  • autoconf (autoconf271)
  • autoconf-archive
  • autoconf213
  • autoconf269
  • automake (automake116x)
  • automake115x
  • backward-cpp
  • bash-completion
  • bashcards
  • bearssl
  • bintools
  • bintoolsNoLibc (binutilsNoLibc)
  • binutils
  • cacert
  • check
  • colort
  • cracklib
  • stdenv (gccStdenv)
  • dav1d
  • discocss
  • docbook_xsl (docbook-xsl-nons)
  • docbook-xsl-ns (docbook_xsl_ns)
  • docbook5
  • docbook_xml_dtd_412
  • docbook_xml_dtd_42
  • docbook_xml_dtd_43
  • docbook_xml_dtd_44
  • docbook_xml_dtd_45
  • docutils (python38Packages.docutils)
  • emma
  • expat
  • file
  • fribidi
  • gcc
  • gdbm
  • getconf (unixtools.getconf)
  • getent (unixtools.getent)
  • getopt
  • gettext
  • gnu-config
  • gnu-efi
  • gnugrep
  • m4 (gnum4)
  • python3 (gnuradioPackages.python ,python38 ,python38Packages.python ,sourcehut.python)
  • gperf
  • graylogPlugins.internal-logs
  • graylogPlugins.slack
  • graylogPlugins.snmp
  • graylogPlugins.twitter
  • help2man
  • hicolor-icon-theme
  • hostname (unixtools.hostname)
  • hunspellDicts.sv-fi (hunspellDicts.sv_FI)
  • hunspellDicts.uk-ua (hunspellDicts.uk_UA)
  • inkscape-extensions.hexmap
  • intltool
  • itstool
  • kexectools
  • keyutils
  • kmod
  • ladspaH
  • libaio
  • libassuan
  • libcap_ng
  • libdatrie
  • libdeflate
  • libedit
  • libelf
  • libev
  • libffi
  • libgpgerror
  • libksba
  • libmnl
  • libnfnetlink
  • libpaper
  • libseccomp
  • libssh2
  • libsysprof-capture
  • libthai
  • libtool (libtool_2)
  • libuninameslist
  • libyaml
  • linuxHeaders
  • locale (unixtools.locale)
  • lsb-release
  • lz4
  • lzo
  • merriweather
  • meson
  • mpvScripts.sponsorblock
  • nanorc
  • nasm
  • ncurses (ncurses6)
  • netsurf.buildsystem
  • nettools
  • ninja
  • nix-zsh-completions
  • npth
  • numactl
  • nv-codec-headers
  • ocaml_make
  • opencl-headers
  • openresolv
  • openssl (openssl_1_1)
  • pciutils
  • perl (perl532 ,perl532Packages.perl)
  • perl532Packages.CGI
  • perl532Packages.CGIFast
  • perl532Packages.CPANMetaCheck
  • perl532Packages.CaptureTiny
  • perl532Packages.ClassDataInheritable
  • perl532Packages.ClassInspector
  • perl532Packages.EncodeLocale
  • perl532Packages.ExtUtilsConfig
  • perl532Packages.ExtUtilsHelpers
  • perl532Packages.ExtUtilsInstallPaths
  • perl532Packages.FCGI
  • perl532Packages.FCGIProcManager
  • perl532Packages.FileListing
  • perl532Packages.FontTTF
  • perl532Packages.HTMLParser
  • perl532Packages.HTMLTagCloud
  • perl532Packages.HTMLTagset
  • perl532Packages.HTTPCookies
  • perl532Packages.HTTPDaemon
  • perl532Packages.HTTPDate
  • perl532Packages.HTTPMessage
  • perl532Packages.HTTPNegotiate
  • perl532Packages.IOHTML
  • perl532Packages.IOString
  • perl532Packages.LWP (perl532Packages.LWPUserAgent)
  • perl532Packages.LWPMediaTypes
  • perl532Packages.LocaleGettext
  • perl532Packages.ModuleBuild
  • perl532Packages.ModuleRuntime
  • perl532Packages.NetHTTP
  • perl532Packages.PathTiny
  • perl532Packages.SubUplevel
  • perl532Packages.TermReadKey
  • perl532Packages.TestDeep
  • perl532Packages.TestException
  • perl532Packages.TestFatal
  • perl532Packages.TestNeeds
  • perl532Packages.TestNoWarnings
  • perl532Packages.TestRequiresInternet
  • perl532Packages.TestWarn
  • perl532Packages.TimeDate
  • perl532Packages.TryTiny
  • perl532Packages.URI
  • perl532Packages.WWWRobotRules
  • perl532Packages.XMLNamespaceSupport
  • perl532Packages.XMLParser
  • perl532Packages.XMLSAX
  • perl532Packages.XMLSAXBase
  • pkg-config
  • pkg-config-unwrapped
  • popt
  • postgresql_jdbc
  • prettyping
  • python38Packages.alabaster
  • python38Packages.appdirs
  • python38Packages.async-timeout
  • python38Packages.atomicwrites
  • python38Packages.attrs
  • python38Packages.certifi
  • python38Packages.colorama
  • python38Packages.coverage
  • python38Packages.dateutil (python38Packages.python-dateutil)
  • python38Packages.distlib
  • python38Packages.filelock
  • python38Packages.imagesize
  • python38Packages.importlib-metadata
  • python38Packages.iniconfig
  • python38Packages.libxml2
  • python38Packages.libxslt
  • python38Packages.linecache2
  • python38Packages.markupsafe
  • python38Packages.mock
  • python38Packages.more-itertools
  • python38Packages.nose
  • python38Packages.packaging
  • python38Packages.pbr
  • python38Packages.pexpect
  • python38Packages.pip
  • python38Packages.pkgconfig
  • python38Packages.pluggy
  • python38Packages.pretend
  • python38Packages.psutil
  • python38Packages.ptyprocess
  • python38Packages.py
  • python38Packages.pycodestyle
  • python38Packages.pycparser
  • python38Packages.pyflakes
  • python38Packages.pygments
  • python38Packages.pyparsing
  • python38Packages.pysocks
  • python38Packages.pytz
  • python38Packages.semantic-version
  • python38Packages.setuptools
  • python38Packages.setuptools-rust
  • python38Packages.setuptools-scm (python38Packages.setuptools_scm)
  • python38Packages.six
  • python38Packages.sortedcontainers
  • python38Packages.sphinxcontrib-applehelp
  • python38Packages.sphinxcontrib-devhelp
  • python38Packages.sphinxcontrib-htmlhelp
  • python38Packages.sphinxcontrib-jsmath
  • python38Packages.sphinxcontrib-qthelp
  • python38Packages.sphinxcontrib-serializinghtml
  • python38Packages.sphinxcontrib-websupport
  • python38Packages.testpath
  • python38Packages.toml
  • python38Packages.traceback2
  • python38Packages.typing-extensions
  • python38Packages.unittest2
  • python38Packages.wcwidth
  • python38Packages.wheel
  • python38Packages.zipp
  • re2c
  • readline (readline6 ,readline63)
  • readline70
  • readline81
  • rhash
  • shen-sources
  • shhopt
  • sipvicious
  • sjasmplus
  • sqlite
  • stdenvNoCC
  • system-sendmail
  • tests.install-shell-files.install-manpage-outputs
  • tmuxPlugins.vim-tmux-focus-events
  • tnt
  • tzdata
  • unicode-character-database
  • unixtools.arp
  • unzip
  • uthash
  • which
  • xhtml1
  • xmlformat
  • xorg.libICE
  • xorg.libXau
  • xorg.libXdmcp
  • xorg.libpthreadstubs
  • xorg.libxcb
  • xorg.utilmacros
  • xorg.xcbproto
  • xorg.xcbutil
  • xorg.xorgproto
  • xorg.xtrans
  • xxHash
  • zsh-history-substring-search
  • zsh-z

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build elf-header-real

@jonringer
Copy link
Contributor Author

able to build them locally

[12:54:14] jon@jon-desktop /home/jon/projects/nixpkgs (fix-glic-version)
$ nix-build -A elf-header-real
/nix/store/8bqlca3aj9kf5zcxr99i5d60am5k8c4c-elf-header-2.32
[12:54:17] jon@jon-desktop /home/jon/projects/nixpkgs (fix-glic-version)
$ nix-build -A libgcc
/nix/store/3n2y3jgk5gy8pdv66y4zc0r5i9smvwnh-libgcc-10.3.0
[12:54:19] jon@jon-desktop /home/jon/projects/nixpkgs (fix-glic-version)

@jonringer jonringer merged commit abbbeaf into NixOS:staging-next May 18, 2021
@jonringer jonringer deleted the fix-glic-version branch May 18, 2021 19:55
@vcunat
Copy link
Member

vcunat commented May 18, 2021

This caused rebuild of Linux stdenvs. Was that itentional for staging-next at this point?

@andir
Copy link
Member

andir commented May 18, 2021

Yeah, the staging cycles introduced a small regression with the glibc versions which are occasionally consumed by other derivations (and configure scripts). We could probably have held this off for one more cycle but IMHO we should fix things that break before merging the staging branch into master.

@vcunat
Copy link
Member

vcunat commented May 18, 2021

OK, so I cancelled the builds obsoleted by this.

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.

None yet

4 participants