Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3c62a8225903
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e0137930f2c4
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 19, 2020

  1. scala_2_11: move text files from $out to appropriate subdirs 

    Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
    Jean-Marie Gaillourdet committed Jan 19, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    yorickvP Yorick
    GPG key ID: A36E70F9DC014A15
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3017d81 View commit details

  2. scala_2_12: move text files from $out to appropriate subdirs 

    Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
    Jean-Marie Gaillourdet committed Jan 19, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    yorickvP Yorick
    GPG key ID: A36E70F9DC014A15
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8b7c59b View commit details

  3. scala: move text files from $out to appropriate subdirs 

    Before, this package installed files called LICENSE and NOTICE at the
profile root directory. Which conflicts with other packages with the
same issue. Those files reside now in $out/share/doc/scala/.
    Jean-Marie Gaillourdet committed Jan 19, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    254045f View commit details

Commits on Jan 24, 2020

  1. Pr scala out dir cleaned (#78042) 

    Pr scala out dir cleaned
    @Mic92
    Mic92 authored Jan 24, 2020
    Copy the full SHA
    e013793 View commit details
Showing with 7 additions and 0 deletions.
  1. +5 −0 pkgs/development/compilers/scala/2.11.nix
  2. +1 −0 pkgs/development/compilers/scala/2.12.nix
  3. +1 −0 pkgs/development/compilers/scala/2.13.nix
5 changes: 5 additions & 0 deletions pkgs/development/compilers/scala/2.11.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
rm "bin/"*.bat
mv * $out
# put docs in correct subdirectory
mkdir -p $out/share/doc
mv $out/doc $out/share/doc/${name}
mv $out/man $out/share/man
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
--prefix PATH ":" ${coreutils}/bin \
1 change: 1 addition & 0 deletions pkgs/development/compilers/scala/2.12.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
# put docs in correct subdirectory
mkdir -p $out/share/doc
mv $out/doc $out/share/doc/scala
mv $out/{LICENSE,NOTICE} $out/share/doc/scala
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \
1 change: 1 addition & 0 deletions pkgs/development/compilers/scala/2.13.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
# put docs in correct subdirectory
mkdir -p $out/share/doc
mv $out/doc $out/share/doc/scala
mv $out/{LICENSE,NOTICE} $out/share/doc/scala
for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p \