-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
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
rstudio: 1.2.5042 -> 1.4.1717 #139887
rstudio: 1.2.5042 -> 1.4.1717 #139887
Conversation
ea8a136
to
301571a
Compare
301571a
to
f25ac17
Compare
60d4621
to
17d8b38
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't tested the build yet.
4201a00
to
fb26508
Compare
- "/usr/lib/libclang.so", | ||
- "/usr/lib/llvm/libclang.so", | ||
- "/usr/lib64/libclang.so", | ||
- "/usr/lib64/llvm/libclang.so", | ||
+ "@libclang.so@" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not an expert here, but isn't this likely to be a fragile patch, since all the removed content will need to match exactly in the future in order for it to apply cleanly? I'm wondering it it might be safer to just patch in an early return at the top of the function instead and otherwise leave the rest of it intact? eg:
std::vector<std::string> systemClangVersions()
{
return { "@libclang.so@" };
[ other content remains unaltered ]
}
fb26508
to
b7ae49e
Compare
Rstudio has now switched to a new versioning scheme |
f26c137
to
8cbcc20
Compare
nixpkgsTop="$(git rev-parse --show-toplevel)" | ||
rstudioDir="$nixpkgsTop/pkgs/applications/editors/rstudio" | ||
|
||
nix-update rstudio |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can grab the latest rstudio version with GitHub's API with
version=$(curl --silent https://api.github.com/repos/rstudio/rstudio/releases/latest | jq --raw-output '.tag_name')
And not use nix-update
, but write the sha256 of the src to an external file and read it in the default.nix
expression with:
nix shell nixpkgs#nix-prefetch-git -c nix-prefetch-git https://github.com/rstudio/rstudio --rev ${version} > $dirname/sha256
What's interesting though, is that the curl
command above doesn't list any published releases, and using:
curl --silent https://api.github.com/repos/rstudio/rstudio/tags | jq '.[0]'
Doesn't return the newest tag with the new version scheme, has't yet figure out why..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Artturin Perhaps this will work for us, at least until they'll make a major change in their website:
curl --silent 'https://www.rstudio.com/products/rstudio/download/' | pup ':parent-of(h3:contains("Source Code")) > a > attr{href}' | awk -F/ '{gsub(/^v/, "", $NF); print $NF}'
Of course there should be somekind of a check that the version found there is not empty.
|
||
nix-update rstudio | ||
|
||
rstudioVer="$(nix-build -A rstudio.version --no-out-link)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be removed if you'd use
version = lib.fileContents ./version;
|
e0bce90
to
66fd4df
Compare
bac5378
to
9dda236
Compare
launching rstudio when version is at
|
FWIW: There is a |
dca1d58
to
8ed57e5
Compare
the problem with libyamlcpp is because there's a libyamlcpp_0_3 and the patch is being applied to it, osm2xmap doesn't build with the newest libyamlcpp even after applying to cmake patch @mpickering |
soci is built with boost
soci is built with boost
Result of 32 packages built:
|
merging without the update script
|
Did you report this upstream? |
grepping the repo i found
so i'll try |
:/ someone else may update to to the newest version
|
Motivation for this change
Things done
it launches but i dont use rstudio so please test
@mikepurvis the libyaml-cpp patch added in this will fix this #133921 (comment)
@james-atkins i used your expr as a reference https://github.com/james-atkins/dotfiles/blob/main/pkgs/rstudio/default.nix
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)