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: 553301324cc7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 101d44202fbe
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 1, 2020

  1. filebot: 4.9.1 -> 4.9.2

    @felschr
    felschr committed Nov 1, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    servalcatty
    GPG key ID: 4A2AAAA382F8294C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8d6cac9 View commit details

  2. Merge pull request #102345 from felschr/feat/filebot492 

    filebot: 4.9.1 -> 4.9.2
    @marsam
    marsam authored Nov 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    101d442 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/video/filebot/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/video/filebot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ in

stdenv.mkDerivation rec {
pname = "filebot";
version = "4.9.1";
version = "4.9.2";

src = fetchurl {
url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms";
sha256 = "0hcyam8l0fzc9fnp1dpawk0s3rwhfph78w99y7zlcv5l4l4h04lz";
};

unpackPhase = "tar xvf $src";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
cp -r filebot.sh lib/ jar/ $out/opt/
# Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead.
substituteInPlace $out/opt/filebot.sh \
--replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
--replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
--replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
wrapProgram $out/opt/filebot.sh \
--prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]}