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

deno: 1.31.1 -> 1.32.3 #221462

Merged
merged 1 commit into from
Apr 13, 2023
Merged

deno: 1.31.1 -> 1.32.3 #221462

merged 1 commit into from
Apr 13, 2023

Conversation

06kellyjac
Copy link
Member

@06kellyjac 06kellyjac commented Mar 16, 2023

Description of changes

Bump deno to 1.32.4
Some other fixes detailed in comment below

Draft until ofborg confirms it builds all good for all platforms

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@06kellyjac 06kellyjac marked this pull request as draft March 16, 2023 10:46
@06kellyjac
Copy link
Member Author

06kellyjac commented Mar 16, 2023

Depends on std::pin::pin! stabilized in rust 1.68 - #220373

@06kellyjac
Copy link
Member Author

1.32.0 out. I've not checked but it's almost certain it is still using 1.68 only features so the above still applies

@LeSuisse
Copy link
Contributor

LeSuisse commented Apr 1, 2023

For information the 1.31.2 contains the fix for CVE-2023-28446.

@06kellyjac
Copy link
Member Author

I guess I'll need to do a separate PR then. Fingers crossed it doesnt need the new rust release 🙃

@06kellyjac 06kellyjac mentioned this pull request Apr 5, 2023
12 tasks
@levex
Copy link

levex commented Apr 11, 2023

hey @06kellyjac, I've locally updated default.nix to 1.32.3 using the update.ts script - should we bump this PR to the newer version? I'm currently running nix-build on an M2 MacBook Pro (aarch64-darwin)

@06kellyjac
Copy link
Member Author

Rust on master still isnt 1.68 so we cant update past where we are ATM. It should reach master soonish though

@levex
Copy link

levex commented Apr 11, 2023

Gotcha - hopefully this gets resolved soon. I'm really keen on making sure Deno is up to date in nixpkgs.

@06kellyjac
Copy link
Member Author

Reached master now
https://nixpk.gs/pr-tracker.html?pr=220373

rebased. added some other fixes, one of which will need testing on ofborg's darwin builders, if it doesn't work I'll revert it.

Not built it myself locally yet since my machine is pre-occupied and deno quite a while to build
https://hydra.nixos.org/job/nixpkgs/trunk/deno.x86_64-linux#tabs-charts

@06kellyjac 06kellyjac changed the title deno: 1.31.1 -> 1.31.3 deno: 1.31.1 -> 1.32.3 Apr 12, 2023
@06kellyjac
Copy link
Member Author

@levex I see you've contributed to the deno project. Are you able to help me adapt the CVE POC to test my backport patch against older deno? #225898

@levex
Copy link

levex commented Apr 12, 2023

@06kellyjac Sure yes! Also Deno is updating today to 1.32.4 so maybe we are better off waiting on this PR until it's released within the next few hours.

@06kellyjac
Copy link
Member Author

06kellyjac commented Apr 12, 2023

Thanks! I couldn't find the equivalent function in older deno diving through the docs.

For the update I don't mind either way. There's not much of a difference in effort for me merging & updating again & creating new PR, vs keeping the pr open & updating again & force pushing
:)

@levex
Copy link

levex commented Apr 12, 2023

Looks like there's a build failure

on c1a01a3ddafe8f5a070ada2abaf44757912cdeda
$ nix-build -E 'with import <nixpkgs> {}; callPackage pkgs/development/web/deno/default.nix {}'
[...snip...]
error: builder for '/nix/store/msc0bjzhjqxn2w887j6ryjgk7263a4hc-deno-1.32.3.drv' failed with exit code 101;
       last 10 log lines:
       >   --> ext/http/lib.rs:61:5
       >    |
       > 61 | use std::pin::pin;
       >    |     ^^^^^^^^^^^^^
       >    |
       >    = note: see issue #93178 <https://github.com/rust-lang/rust/issues/93178> for more information
       >
       > For more information about this error, try `rustc --explain E0658`.
       > error: could not compile `deno_http` due to 3 previous errors
       > warning: build failed, waiting for other jobs to finish...
       For full logs, run 'nix log /nix/store/msc0bjzhjqxn2w887j6ryjgk7263a4hc-deno-1.32.3.drv'.

aarch64-darwin M2 macbook pro

@06kellyjac
Copy link
Member Author

06kellyjac commented Apr 12, 2023

Edit:
Ahh you're using your local <nixpkgs> to do the build which is providing old rust

You can do nix build github:06kellyjac/nixpkgs/deno#deno to make sure you get the whole working tree. (You may need to add unstable feature flags)

Or since it looks like you have cloned my branch you can do nix-build -A deno to just use the local ./. tree or nix-build -E 'with import ./. {}; callPackage pkgs/development/web/deno/default.nix {}' but I would recommend the former


This std::pin::pin issue should have been resolved by the upgrade to rust 1.68 🙃

https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html#local-pin-construction

image

🤔

@06kellyjac
Copy link
Member Author

lld still not available in darwin builds as far as it seems, reverting for now

@06kellyjac 06kellyjac marked this pull request as ready for review April 13, 2023 08:44
Don't inherit from package sets in all-packages NixOS#204303
Fix update script to use new hash cargoHash attrs
@06kellyjac 06kellyjac changed the title deno: 1.31.1 -> 1.32.3 deno: 1.31.1 -> 1.32.4 Apr 13, 2023
@SuperSandro2000 SuperSandro2000 merged commit ea38d91 into NixOS:master Apr 13, 2023
@06kellyjac 06kellyjac deleted the deno branch April 13, 2023 15:08
@aduh95
Copy link
Contributor

aduh95 commented Apr 13, 2023

The PR title and the commit message says deno 1.32.4, but the code says 1.32.3.

@SuperSandro2000 SuperSandro2000 changed the title deno: 1.31.1 -> 1.32.4 deno: 1.31.1 -> 1.32.3 Apr 14, 2023
@06kellyjac
Copy link
Member Author

staged but didn't get committed #226158

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.

5 participants