dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

jetbrains: update script improvements

Browse Source 
Fix some warnings and allow updating only the free modules.
This commit is contained in:
Arnout Engelen 2021-07-03 09:20:31 +02:00
parent d8079260a3
commit afef449235
No known key found for this signature in database
GPG Key ID: 061107B0F74A6DAA
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/jetbrains/common.nix
View File

@ -38,7 +38,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
nativeBuildInputs = [ makeWrapper patchelf unzip ]; nativeBuildInputs = [ makeWrapper patchelf unzip ];
patchPhase = lib.optionalString (!stdenv.isDarwin) '' postPatch = lib.optionalString (!stdenv.isDarwin) ''
get_file_size() { get_file_size() {
local fname="$1" local fname="$1"
echo $(ls -l $fname | cut -d ' ' -f5) echo $(ls -l $fname | cut -d ' ' -f5)
@ -64,6 +64,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
cp -a . $out/$name cp -a . $out/$name
ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png
@ -86,6 +88,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--set ${hiName}_VM_OPTIONS ${vmoptsFile} --set ${hiName}_VM_OPTIONS ${vmoptsFile}
ln -s "$item/share/applications" $out/share ln -s "$item/share/applications" $out/share
runHook postInstall
''; '';
} // lib.optionalAttrs (!(meta.license.free or true)) { } // lib.optionalAttrs (!(meta.license.free or true)) {

4
pkgs/applications/editors/jetbrains/default.nix
View File

@ -193,7 +193,7 @@ let
platforms = platforms.linux; platforms = platforms.linux;
}; };
}).overrideAttrs (attrs: { }).overrideAttrs (attrs: {
patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
rm -rf lib/ReSharperHost/linux-x64/dotnet rm -rf lib/ReSharperHost/linux-x64/dotnet
mkdir -p lib/ReSharperHost/linux-x64/dotnet/ mkdir -p lib/ReSharperHost/linux-x64/dotnet/
ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
@ -229,7 +229,7 @@ let
platforms = platforms.linux; platforms = platforms.linux;
}; };
}).overrideAttrs (attrs: { }).overrideAttrs (attrs: {
patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) ''
# Webstorm tries to use bundled jre if available. # Webstorm tries to use bundled jre if available.
# Lets prevent this for the moment # Lets prevent this for the moment
rm -r jbr rm -r jbr

6
pkgs/applications/editors/jetbrains/update.pl
View File

@ -6,6 +6,8 @@ use List::Util qw(reduce);
use File::Slurp; use File::Slurp;
use LWP::Simple; use LWP::Simple;
my $only_free = grep { $_ eq "--only-free" } @ARGV;
sub semantic_less { sub semantic_less {
my ($a, $b) = @_; my ($a, $b) = @_;
$a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg;
@ -55,13 +57,15 @@ sub update_nix_block {
die "no version in $block" unless $version; die "no version in $block" unless $version;
if ($version eq $latest_versions{$channel}) { if ($version eq $latest_versions{$channel}) {
print("$channel is up to date at $version\n"); print("$channel is up to date at $version\n");
} elsif ($only_free && $block =~ /licenses\.unfree/) {
print("$channel is unfree, skipping\n");
} else { } else {
print("updating $channel: $version -> $latest_versions{$channel}\n"); print("updating $channel: $version -> $latest_versions{$channel}\n");
my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; my ($url) = $block =~ /url\s*=\s*"([^"]+)"/;
# try to interpret some nix # try to interpret some nix
my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
$name =~ s/\$\{version\}/$latest_versions{$channel}/; $name =~ s/\$\{version\}/$latest_versions{$channel}/;
# Some url paattern contain variables more than once # Some url pattern contain variables more than once
$url =~ s/\$\{name\}/$name/g; $url =~ s/\$\{name\}/$name/g;
$url =~ s/\$\{version\}/$latest_versions{$channel}/g; $url =~ s/\$\{version\}/$latest_versions{$channel}/g;
die "$url still has some interpolation" if $url =~ /\$/; die "$url still has some interpolation" if $url =~ /\$/;