diff options
| author | Colin Arnott <colin@urandom.co.uk> | 2023-02-02 13:00:53 +0000 |
|---|---|---|
| committer | Colin Arnott <colin@urandom.co.uk> | 2023-02-02 13:00:53 +0000 |
| commit | ce03e686a7143ac1b7dd07d6b44218372caa124e (patch) | |
| tree | f9db29bd3b15754b69a22681e8c58cd90a4cb930 /pkgs/applications/audio/aaxtomp3 | |
| parent | 3cff1da83480ee70413ff2339d56ee9327fc58b1 (diff) | |
aaxtomp3: drop osh patch
Upstream has resolved oilshell/oil#1446, and nixpkgs consumed the fix.
Diffstat (limited to 'pkgs/applications/audio/aaxtomp3')
| -rw-r--r-- | pkgs/applications/audio/aaxtomp3/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/aaxtomp3/osh.patch | 15 |
2 files changed, 0 insertions, 19 deletions
diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/applications/audio/aaxtomp3/default.nix index 94fea0c8b9d14..59bd228d4751a 100644 --- a/pkgs/applications/audio/aaxtomp3/default.nix +++ b/pkgs/applications/audio/aaxtomp3/default.nix @@ -27,10 +27,6 @@ resholve.mkDerivation rec { hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg="; }; - # use whitespace to show osh arithmetic is not file redirection - # see: https://github.com/oilshell/oil/issues/1446 - patches = [./osh.patch]; - postPatch = '' substituteInPlace AAXtoMP3 \ --replace 'AAXtoMP3' 'aaxtomp3' diff --git a/pkgs/applications/audio/aaxtomp3/osh.patch b/pkgs/applications/audio/aaxtomp3/osh.patch deleted file mode 100644 index 548486c7b1736..0000000000000 --- a/pkgs/applications/audio/aaxtomp3/osh.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/AAXtoMP3 b/AAXtoMP3 -index 90566ad..71e94da 100755 ---- a/AAXtoMP3 -+++ b/AAXtoMP3 -@@ -200,8 +200,8 @@ progressbar() { - - #draw progressbar with one # for every 5% and blank spaces for the missing part. - progressbar="" -- for (( n=0; n<(percentage/5); n++ )) ; do progressbar="$progressbar#"; done -- for (( n=0; n<(20-(percentage/5)); n++ )) ; do progressbar="$progressbar "; done -+ for (( n=0; n< (percentage/5); n++ )) ; do progressbar="$progressbar#"; done -+ for (( n=0; n< (20-(percentage/5)); n++ )) ; do progressbar="$progressbar "; done - - #print progressbar - echo -ne "Chapter splitting: |$progressbar| $print_percentage% ($part/$total chapters)\r" |