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

fetchYarnDeps: properly accept src argument #319623

Merged
merged 2 commits into from
Jun 15, 2024

Conversation

Infinidoge
Copy link
Contributor

Description of changes

fetchYarnDeps is supposed to accept the src, argument, defaulting to unpacking and getting the yarn.lock from $src. However, after checking if src exists for whether or not to run the unpackPhase, it drops src from the arguments, leading Nix to say variable $src or $srcs should point to the source despite (supposedly) being passed src.

This fixes that :)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Atemu
Copy link
Member

Atemu commented Jun 14, 2024

Somehow this causes a rebuild of electron?

@Infinidoge
Copy link
Contributor Author

Wild.

I'll look into tracking down why it causes a rebuild later today.

@Infinidoge
Copy link
Contributor Author

Oh I think I know why. It rebuilds because of the difference between src not existing and src being null.

This would cause any drv to be rebuilt when any part of the default.nix changes.
What we actually care about is the two JS files though, so simply reference them
directly.

Co-authored-by: Infinidoge <infinidoge@inx.moe>
@Atemu
Copy link
Member

Atemu commented Jun 15, 2024

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

2 packages marked as broken and skipped:
  • electron-fiddle
  • itch
137 packages built:
  • affine
  • akkoma-frontends.admin-fe
  • akkoma-frontends.akkoma-fe
  • alice-lg
  • anki
  • anki.dist
  • anki.doc
  • anki.man
  • antares
  • aws-azure-login
  • bilibili
  • bitwarden-desktop
  • bitwarden-directory-connector
  • breitbandmessung
  • bruno
  • camunda-modeler
  • das
  • das.dist
  • devcontainer
  • discourse
  • discourseAllPlugins
  • drawio
  • drawio-headless
  • electron (electron_30)
  • electron_29
  • element-desktop
  • element-desktop-wayland
  • element-web (element-web-unwrapped)
  • fcast-receiver
  • feishin
  • fernglas
  • fixup-yarn-lock
  • freetube
  • gitlab
  • gitlab-ee
  • gitmoji-cli
  • gotify-server
  • grafana-agent
  • grafana-alloy
  • grocy
  • headset
  • heroic
  • heroic-unwrapped
  • hydrogen-web (hydrogen-web-unwrapped)
  • jitsi-meet-electron
  • ki
  • ki.dist
  • koodo-reader
  • kuro
  • lxd-ui
  • marp-cli
  • mastodon
  • matrix-appservice-irc
  • mealie
  • mealie.dist
  • mermaid-cli
  • mnemosyne
  • mnemosyne.dist
  • morgen
  • muzika
  • nix-tour
  • node-hp-scan-to
  • obsidian
  • open-stage-control
  • outline
  • pandoc-drawio-filter
  • pandoc-drawio-filter.dist
  • passky-desktop
  • peertube
  • peertube.cli
  • peertube.runner
  • pgadmin4
  • pgadmin4-desktopmode
  • pgadmin4-desktopmode.dist
  • pgadmin4.dist
  • picosnitch
  • picosnitch.dist
  • podman-desktop
  • prefetch-yarn-deps
  • pritunl-client
  • proton-pass
  • protonmail-desktop
  • pxder
  • python311Packages.dash
  • python311Packages.dash.dist
  • python311Packages.mkdocs-drawio-exporter
  • python311Packages.mkdocs-drawio-exporter.dist
  • python312Packages.dash
  • python312Packages.dash.dist
  • python312Packages.mkdocs-drawio-exporter
  • python312Packages.mkdocs-drawio-exporter.dist
  • r2modman
  • ratman
  • redisinsight
  • revolt-desktop
  • ride
  • rmfakecloud
  • sapling
  • sapling.dist
  • sharedown
  • shepherd
  • siyuan
  • standardnotes
  • stretchly
  • super-productivity
  • tandoor-recipes
  • teams-for-linux
  • teleport (teleport_15)
  • teleport.client (teleport_15.client)
  • teleport_14
  • teleport_14.client
  • terra-station
  • tetrio-desktop
  • textlint-rule-abbr-within-parentheses
  • textlint-rule-common-misspellings
  • textlint-rule-en-max-word-count
  • textlint-rule-max-comma
  • textlint-rule-no-start-duplicated-conjunction
  • textlint-rule-period-in-list-item
  • textlint-rule-preset-ja-technical-writing
  • textlint-rule-unexpanded-acronym
  • textlint-rule-write-good
  • thedesk
  • thelounge
  • threema-desktop
  • tilt
  • uhk-agent
  • uhk-udev-rules
  • uivonim
  • vercel-pkg
  • vesktop
  • vieb
  • webcord
  • webcord-vencord
  • your_spotify
  • youtube-music
  • ytdownloader

@Atemu Atemu merged commit 2bea891 into NixOS:master Jun 15, 2024
20 checks passed
@Atemu
Copy link
Member

Atemu commented Jun 26, 2024

For future reference, the rebuild was caused by an instance of #301014 which we fixed in 882cf18; causing one more rebuild but that should be the last.

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.

2 participants