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

treewide: Fix or comment where fetchFromGitHub fetches a commit which is not on a branch on the specified repo #110857

Merged
merged 18 commits into from
Feb 11, 2021

Conversation

SuperSandro2000
Copy link
Member

Motivation for this change

#20836 (comment)

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.

…st master which changes only CI after several force pushes
The commit choosen is the parent of the commit that was here before.
The change in the commit does not matter for NixOS.
@SuperSandro2000
Copy link
Member Author

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

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

2 packages marked as broken and skipped:
  • linuxPackages_hardkernel_4_14.acpi_call
  • linuxPackages_hardkernel_latest.acpi_call
2 packages failed to build and are new build failures:
25 packages built:
  • gr-ais
  • hdl-dump
  • libretro.snes9x
  • linuxPackages.acpi_call (linuxPackages_5_4.acpi_call)
  • linuxPackages_4_14.acpi_call
  • linuxPackages_4_19.acpi_call
  • linuxPackages_4_4.acpi_call
  • linuxPackages_4_9.acpi_call
  • linuxPackages_5_10.acpi_call (linuxPackages_latest.acpi_call)
  • linuxPackages_hardened.acpi_call
  • linuxPackages_latest-libre.acpi_call
  • linuxPackages_latest_hardened.acpi_call
  • linuxPackages_latest_xen_dom0.acpi_call
  • linuxPackages_latest_xen_dom0_hardened.acpi_call
  • linuxPackages_lqx.acpi_call
  • linuxPackages_testing_bcachefs.acpi_call
  • linuxPackages_xen_dom0.acpi_call
  • linuxPackages_xen_dom0_hardened.acpi_call
  • linuxPackages_zen.acpi_call
  • paperless
  • python37Packages.nmigen-soc
  • python38Packages.nmigen-soc
  • python39Packages.nmigen-soc
  • snipes
  • usync

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "openAVproductions";
repo = "openAV-ArtyFX";
rev = "492587461b50d140455aa3c98d915eb8673bebf0";
rev = "8c542627d936a01b1d97825e7f26a8e95633f7aa";
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems to have a proper release now: https://github.com/openAVproductions/openAV-ArtyFX/releases/tag/release-1.3.1

That is not much more advanced than commit 8c542627d936a01b1d97825e7f26a8e95633f7aa (just 4 commits behind). Could we switch to it instead 🤔 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't really want to update anything with this PR. Could you open a new PR with that update?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah ok, I thought that some of the fixes here were bumps (like django-crispy-forms), but you just moved to the release that pointed to the same commit?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's The only bump. For all other packages I tried to find the closest commit.

pkgs/development/tools/trellis/default.nix Show resolved Hide resolved
@@ -5,8 +5,9 @@ fetchFromGitHub {

owner = "tomokuni";
repo = "Myrica";
rev = "b737107723bfddd917210f979ccc32ab3eb6dc20";
sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12";
# commit does not exist on any branch on the target repository
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this commit found is master 🤔 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Almost all commits are no different and no longer contain the TCC files.

@@ -7,6 +7,7 @@ buildLinux (args // {
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs";
# commit does not exist on any branch on the target repository
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

I did not want to change anything here because I was to lazy to regenerate the deps.nix.

Copy link
Contributor

Choose a reason for hiding this comment

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

No, I mean, I found this exactly commit in master.

Copy link
Contributor

Choose a reason for hiding this comment

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

Just look at the link I posted. It is exactly this commit and this is the show of the master branch (just after the commit you asked).

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe your script is bugged 🤔 ?

Copy link
Contributor

Choose a reason for hiding this comment

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

NVM GitHub seems to be even more dumb than I thought (if I change master to any other valid branch it shows the same history).

@SuperSandro2000
Copy link
Member Author

@ofborg build linuxPackages-libre.acpi_call

@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "nix-community";
repo = "acpi_call";
rev = "3d7c9fe5ed3fc5ed5bafd39d54b1fdc7a09ce710";
sha256 = "09kp8zl392h99wjwzqrdw2xcfnsc944hzmfwi8n1y7m2slpdybv3";
rev = "fe4cd0124099b88b61f83006023bc0d95e742e75";
Copy link
Contributor

Choose a reason for hiding this comment

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

Release 1.2.1 is not that much newer than this tag and includes fe4cd01. Maybe use it 🤔 ?

@SuperSandro2000
Copy link
Member Author

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

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

1 package failed to build and are new build failure:
  • linuxPackages-libre.acpi_call: log was empty
26 packages built:
  • gr-ais (gnuradio-ais)
  • gnuradio-with-packages
  • hdl-dump
  • libretro.snes9x
  • linuxPackages.acpi_call
  • linuxPackages_4_14.acpi_call
  • linuxPackages_4_19.acpi_call
  • linuxPackages_4_4.acpi_call
  • linuxPackages_4_9.acpi_call
  • linuxPackages_5_10.acpi_call
  • linuxPackages_hardened.acpi_call
  • linuxPackages_latest-libre.acpi_call
  • linuxPackages_latest_hardened.acpi_call
  • linuxPackages_latest_xen_dom0.acpi_call
  • linuxPackages_latest_xen_dom0_hardened.acpi_call
  • linuxPackages_lqx.acpi_call
  • linuxPackages_testing_bcachefs.acpi_call
  • linuxPackages_xen_dom0.acpi_call
  • linuxPackages_xen_dom0_hardened.acpi_call
  • linuxPackages_zen.acpi_call
  • paperless
  • python37Packages.nmigen-soc
  • python38Packages.nmigen-soc
  • python39Packages.nmigen-soc
  • snipes
  • usync

@SuperSandro2000 SuperSandro2000 merged commit 41d270c into NixOS:master Feb 11, 2021
@SuperSandro2000 SuperSandro2000 deleted the fix-collection6 branch February 11, 2021 00:32
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