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

libvorbis: fix 404'ing patch #86429

Merged
merged 1 commit into from May 1, 2020
Merged

libvorbis: fix 404'ing patch #86429

merged 1 commit into from May 1, 2020

Conversation

@cole-h
Copy link
Member

cole-h commented May 1, 2020

Also use full commit for the other patch, just in case there's ever a
collision, as unlikely as that may be.

Motivation for this change

Thanks to Kyndig on IRC, again.

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.

I'll open backport PRs after this is merged. @veprbl, since you did that last time for the ninja 404, should I backport to 19.03 and 19.09 as well? (20.03 is a given)

Copy link
Member

veprbl left a comment

hash mismatch in fixed-output derivation '/nix/store/w00h096swm34ankjl81dxf83lz25q9bq-CVE-2017-14160+CVE-2018-10393.patch':
  wanted: sha256:0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x
  got:    sha256:18k4vp0nmrxxpis641ylnw6dgwxrymh5bf74njr6v8dizmmz1bkj
Also use full commit for the other patch, just in case there's ever a
collision, as unlikely as that may be.
@cole-h cole-h force-pushed the cole-h:patch-404 branch from ba9097f to f02e1c2 May 1, 2020
@cole-h
Copy link
Member Author

cole-h commented May 1, 2020

Huh, I swore I checked that with ,vimtofu... Sorry, should be sorted now.

@cole-h
Copy link
Member Author

cole-h commented May 1, 2020

Darn, I was hoping this wouldn't need to go to staging...

@veprbl
Copy link
Member

veprbl commented May 1, 2020

This is no big deal

@veprbl veprbl changed the base branch from master to staging May 1, 2020
@veprbl veprbl added this to WIP in Staging via automation May 1, 2020
Staging automation moved this from WIP to Ready May 1, 2020
@veprbl
veprbl approved these changes May 1, 2020
@FRidh FRidh merged commit 90c5032 into NixOS:staging May 1, 2020
17 checks passed
17 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f02e1c2"; rev="f02e1c2878b90fa42c45465f80ad0647987ce5b0"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f02e1c2"; rev="f02e1c2878b90fa42c45465f80ad0647987ce5b0"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f02e1c2"; rev="f02e1c2878b90fa42c45465f80ad0647987ce5b0"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f02e1c2"; rev="f02e1c2878b90fa42c45465f80ad0647987ce5b0"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f02e1c2"; rev="f02e1c2878b90fa42c45465f80ad0647987ce5b0"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f02e1c2"; rev="f02e1c2878b90fa42c45465f80ad0647987ce5b0"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f02e1c2"; rev="f02e1c2878b90fa42c45465f80ad0647987ce5b0"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
libvorbis, libvorbis.passthru.tests on aarch64-linux Success
Details
libvorbis, libvorbis.passthru.tests on x86_64-darwin Success
Details
libvorbis, libvorbis.passthru.tests on x86_64-linux Success
Details
Staging automation moved this from Ready to Done May 1, 2020
@cole-h cole-h deleted the cole-h:patch-404 branch May 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.