public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100193 from AndersonTorres/big-upload 

A bunch of updates
This commit is contained in:
Anderson Torres 2020-10-12 08:48:52 -03:00 committed by GitHub
parent 0f81680440 a0c7341947
commit e61c9d185d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 89 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/applications/audio/a2jmidid/default.nix
View File

@ -1,38 +1,24 @@
{ stdenv, fetchurl, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2 { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
, wafHook , python3Packages , meson, ninja }:
, python2Packages}:
let stdenv.mkDerivation rec {
inherit (python2Packages) python dbus-python;
in stdenv.mkDerivation {
pname = "a2jmidid"; pname = "a2jmidid";
version = "8"; version = "9";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/linuxaudio/a2jmidid/archive/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; owner = "linuxaudio";
sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; repo = pname;
rev = version;
sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ=";
}; };
nativeBuildInputs = [ pkgconfig makeWrapper wafHook ]; nativeBuildInputs = [ pkgconfig makeWrapper meson ninja ];
buildInputs = [ alsaLib dbus libjack2 python dbus-python ]; buildInputs = [ alsaLib dbus libjack2 ] ++
(with python3Packages; [ python dbus-python ]);
patches = [
(fetchpatch {
url = "https://github.com/linuxaudio/a2jmidid/commit/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2.diff";
sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc";
})
(fetchpatch {
url = "https://github.com/linuxaudio/a2jmidid/commit/7f82da7eb2f540a94db23331be98d42a58ddc269.diff";
sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv";
})
(fetchpatch {
url = "https://github.com/linuxaudio/a2jmidid/commit/c07775d021a71cb91bf64ce1391cf525415cb060.diff";
sha256 = "172v9hri03qdqi8a3zsg227k5qxldd8v5bj4jk7fyk5jf50fcxga";
})
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

44
pkgs/applications/audio/kid3/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, pkgconfig, cmake, python, ffmpeg_3, phonon, automoc4 , pkgconfig, cmake, python3, ffmpeg_3, phonon, automoc4
, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt
, id3lib, taglib, mp4v2, flac, libogg, libvorbis , id3lib, taglib, mp4v2, flac, libogg, libvorbis
, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols
@ -7,18 +7,17 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kid3"; pname = "kid3";
version = "3.8.3"; version = "3.8.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
sha256 = "0i0c4bmsm36jj1v535kil47ig0ig70ykrzcw2f56spr25xns06ka"; sha256 = "sha256-WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc=";
}; };
nativeBuildInputs = [ wrapQtAppsHook ]; nativeBuildInputs = [ wrapQtAppsHook ];
buildInputs = with stdenv.lib; buildInputs = [
[ pkgconfig cmake python ffmpeg_3 phonon automoc4 pkgconfig cmake python3 ffmpeg_3 phonon automoc4
chromaprint docbook_xml_dtd_45 docbook_xsl libxslt chromaprint docbook_xml_dtd_45 docbook_xsl libxslt
id3lib taglib mp4v2 flac libogg libvorbis zlib readline id3lib taglib mp4v2 flac libogg libvorbis zlib readline
qtbase qttools qtmultimedia qtquickcontrols ]; qtbase qttools qtmultimedia qtquickcontrols ];
@ -35,34 +34,33 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple and powerful audio tag editor"; description = "A simple and powerful audio tag editor";
longDescription = '' longDescription = ''
If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC,
MP4/AAC, MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF MP2, Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files (e.g. full
files (e.g. full albums) without typing the same information albums) without typing the same information again and again and have
again and again and have control over both ID3v1 and ID3v2 tags, control over both ID3v1 and ID3v2 tags, then Kid3 is the program you are
then Kid3 is the program you are looking for. looking for.
With Kid3 you can: With Kid3 you can:
- Edit ID3v1.1 tags; - Edit ID3v1.1 tags;
- Edit all ID3v2.3 and ID3v2.4 frames; - Edit all ID3v2.3 and ID3v2.4 frames;
- Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags - Convert between ID3v1.1, ID3v2.3 and ID3v2.4 tags
- Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, - Edit tags in MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2, Opus, Speex,
Speex, TrueAudio, WavPack, WMA, WAV, AIFF files and tracker TrueAudio, WavPack, WMA, WAV, AIFF files and tracker modules (MOD, S3M,
modules (MOD, S3M, IT, XM); IT, XM);
- Edit tags of multiple files, e.g. the artist, album, year and - Edit tags of multiple files, e.g. the artist, album, year and genre of
genre of all files of an album typically have the same values all files of an album typically have the same values and can be set
and can be set together; together;
- Generate tags from filenames; - Generate tags from filenames;
- Generate tags from the contents of tag fields; - Generate tags from the contents of tag fields;
- Generate filenames from tags; - Generate filenames from tags;
- Rename and create directories from tags; - Rename and create directories from tags;
- Generate playlist files; - Generate playlist files;
- Automatically convert upper and lower case and replace strings; - Automatically convert upper and lower case and replace strings;
- Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, - Import from gnudb.org, TrackType.org, MusicBrainz, Discogs, Amazon and
Amazon and other sources of album data; other sources of album data;
- Export tags as CSV, HTML, playlists, Kover XML and in other - Export tags as CSV, HTML, playlists, Kover XML and in other formats;
formats; - Edit synchronized lyrics and event timing codes, import and export
- Edit synchronized lyrics and event timing codes, import and LRC files.
export LRC files
''; '';
homepage = "http://kid3.sourceforge.net/"; homepage = "http://kid3.sourceforge.net/";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;

12
pkgs/applications/networking/browsers/luakit/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "luakit"; pname = "luakit";
version = "2.2"; version = "2.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luakit"; owner = "luakit";
repo = "luakit"; repo = pname;
rev = version; rev = version;
sha256 = "sha256-rpHW5VyntmmtekdNcZMIw8Xdv4cfiqJaaHj4ZFFGjYc="; sha256 = "sha256-78B8vXkWsFMJIHA72Qrk2SWubrY6YuArqcM0UAPjpzc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -20,11 +20,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
webkitgtk luafilesystem luajit sqlite gtk3 webkitgtk luafilesystem luajit sqlite gtk3
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
glib-networking # TLS support glib-networking # TLS support
]; ] ++ ( with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good
gst-plugins-bad gst-plugins-ugly gst-libav ]);
preBuild = '' preBuild = ''
# build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found

28
pkgs/applications/science/math/pari/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch
, gmp , gmp
, readline , readline
, libX11 , libX11
@ -13,22 +12,13 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pari"; pname = "pari";
version = "2.11.3"; version = "2.11.4";
src = fetchurl { src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"; url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467"; sha256 = "sha256-v8iPxPc1L0hA5uNSxy8DacvqikVAOxg0piafNwmXCxw=";
}; };
patches = [
# https://trac.sagemath.org/ticket/29313#comment:1
(fetchpatch {
name = "backport-bug-fix.patch";
url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/c7a1d35f.patch?h=packages/pari&id=27893d227290dc3821d68aa25877d9765c204dad";
sha256 = "0vm0fwyzj66cr32imip6srksd47s2s2sjl1rb26ph8gpfi3nalii";
})
];
buildInputs = [ buildInputs = [
gmp gmp
readline readline
@ -72,14 +62,14 @@ stdenv.mkDerivation rec {
Belabas with the help of many volunteer contributors. Belabas with the help of many volunteer contributors.
- PARI is a C library, allowing fast computations. - PARI is a C library, allowing fast computations.
- gp is an easy-to-use interactive shell giving access to the - gp is an easy-to-use interactive shell giving access to the PARI
PARI functions. functions.
- GP is the name of gp's scripting language. - GP is the name of gp's scripting language.
- gp2c, the GP-to-C compiler, combines the best of both worlds - gp2c, the GP-to-C compiler, combines the best of both worlds by
by compiling GP scripts to the C language and transparently loading compiling GP scripts to the C language and transparently loading the
the resulting functions into gp. (gp2c-compiled scripts will typically resulting functions into gp. (gp2c-compiled scripts will typically run
run 3 or 4 times faster.) gp2c currently only understands a subset 3 or 4 times faster.) gp2c currently only understands a subset of the
of the GP language. GP language.
''; '';
homepage = "http://pari.math.u-bordeaux.fr"; homepage = "http://pari.math.u-bordeaux.fr";
downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; downloadPage = "http://pari.math.u-bordeaux.fr/download.html";

11
pkgs/applications/science/math/pari/gp2c.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchurl { stdenv
, pari, perl }: , pari
, fetchurl
, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gp2c"; pname = "gp2c";
version = "0.0.11pl3"; version = "0.0.11pl4";
src = fetchurl { src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
sha256 = "0yymbrgyjw500hqgmkj5m4nmscd7c9rs9w2c96lxgrcyab8krhrm"; sha256 = "sha256-QGocEXxTahB5fHhlWtHXgMEl6brQ34LNwScxHNuB1rI=";
}; };
buildInputs = [ pari perl ]; buildInputs = [ pari perl ];

16
pkgs/applications/window-managers/icewm/default.nix
View File

@ -9,24 +9,22 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "icewm"; pname = "icewm";
version = "1.8.1"; version = "1.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bbidulock"; owner = "bbidulock";
repo = "icewm"; repo = pname;
rev = version; rev = version;
sha256 = "0qd3cakhhjc7h6xr9q3ia9f8wln6q23dlqvw19khia26c0dgyd7b"; sha256 = "sha256-cTJQlUaGvbJmu1xYwFp5GPrM5NjfKBzaMc+l7FeMUP8=";
}; };
nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];
buildInputs = [ buildInputs = [
gettext libjpeg libtiff libungif libpng imlib expat gettext libjpeg libtiff libungif libpng imlib expat freetype fontconfig
freetype fontconfig gdk-pixbuf gdk-pixbuf-xlib glib mkfontdir libX11 gdk-pixbuf gdk-pixbuf-xlib glib mkfontdir libX11 libXft libXext libXinerama
libXft libXext libXinerama libXrandr libICE libSM libXpm libXrandr libICE libSM libXpm libXdmcp libxcb libpthreadstubs pcre
libXdmcp libxcb libpthreadstubs pcre libsndfile fribidi libsndfile fribidi libXdamage libXcomposite libXfixes ];
libXdamage libXcomposite libXfixes
];
cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ]; cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ];

19
pkgs/data/fonts/comic-neue/default.nix
View File

@ -2,33 +2,26 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "comic-neue"; pname = "comic-neue";
version = "2.5"; version = "2.51";
src = fetchzip { src = fetchzip {
url = "http://comicneue.com/${pname}-${version}.zip"; url = "http://comicneue.com/${pname}-${version}.zip";
sha256 = "1kc0yyha6cc584vcl9z1cq1z6prgkxk93g75mr8gapfdrj25dp3q"; sha256 = "sha256-DjRZtFnJOtZnxhfpgU5ihZFAonRK608/BQztCAExIU0=";
stripRoot = false; # because it comes with a __MACOSX directory stripRoot = false; # because it comes with a __MACOSX directory
}; };
phases = [ "unpackPhase" "installPhase" ]; phases = [ "unpackPhase" "installPhase" ];
installPhase = '' installPhase = ''
mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,EOT,WOFF,WOFF2}} mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}}
cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/
cp -v ${pname}-${version}/Booklet-ComicNeue.pdf $out/share/doc/
cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype
cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype
cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype
cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype
cp -v ${pname}-${version}/WebFonts/eot/ComicNeue-Angular/*.eot $out/share/fonts/EOT cp -v ${pname}-${version}/WebFonts/*.woff $out/share/fonts/WOFF
cp -v ${pname}-${version}/WebFonts/eot/ComicNeue/*.eot $out/share/fonts/EOT cp -v ${pname}-${version}/WebFonts/*.woff2 $out/share/fonts/WOFF2
cp -v ${pname}-${version}/WebFonts/woff/ComicNeue-Angular/*.woff $out/share/fonts/WOFF
cp -v ${pname}-${version}/WebFonts/woff/ComicNeue/*.woff $out/share/fonts/WOFF
cp -v ${pname}-${version}/WebFonts/woff2/ComicNeue/*.woff2 $out/share/fonts/WOFF2
# Quick fix for conflicting names in upstream
for i in ${pname}-${version}/WebFonts/woff2/ComicNeue-Angular/*.woff2; do
cp -v $i $out/share/fonts/WOFF2/`basename $i|sed -e 's|ComicNeue|ComicNeue-Angular|'`
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

11
pkgs/development/guile-modules/guile-reader/default.nix
View File

@ -5,20 +5,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guile-reader"; pname = "guile-reader";
version = "0.6.2"; version = "0.6.3";
src = fetchurl { src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz"; url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz";
sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"; sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
}; };
patches = [
(fetchpatch {
name = "0001-fix-prototypes.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31";
sha256 = "01ar34xgpxyli8v2bk4kj6876kyrxhxhfpv9v07lx36d254bzrjb";
}) ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gperf guile guile-lib libffi ]; buildInputs = [ gperf guile guile-lib libffi ];

12
pkgs/misc/emulators/stella/default.nix
View File

@ -1,24 +1,22 @@
{ stdenv, fetchFromGitHub, pkgconfig, SDL2 }: { stdenv, fetchFromGitHub, pkg-config, SDL2 }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "stella"; pname = "stella";
version = "6.3"; version = "6.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stella-emu"; owner = "stella-emu";
repo = "stella"; repo = pname;
rev = version; rev = version;
sha256 = "0a687qdd1qxdz2wzx557vgylv4c37cpypz2gr7p432rgymmzdcg6"; sha256 = "sha256-5rH2a/Uvi0HuyU/86y87g5FN/dunlP65+K3j0Bo+yCg=";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL2 ]; buildInputs = [ SDL2 ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with stdenv.lib;{
description = "An open-source Atari 2600 VCS emulator"; description = "An open-source Atari 2600 VCS emulator";
longDescription = '' longDescription = ''
Stella is a multi-platform Atari 2600 VCS emulator released under Stella is a multi-platform Atari 2600 VCS emulator released under

12
pkgs/tools/misc/3mux/default.nix
View File

@ -2,21 +2,27 @@
buildGoModule rec { buildGoModule rec {
pname = "3mux"; pname = "3mux";
version = "0.3.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aaronjanse"; owner = "aaronjanse";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "164jylifkdfsi3r6vmlp5afgly73fqfbad7lbr58wmy21l9x5rcj"; sha256 = "sha256-auEMG3txO2JS/2dMFBtEujv9s5I0A80Vwts5kXjH600=";
}; };
vendorSha256 = "0dc1c0z3xkfpwmwb3hafsv7qa6lc7bzz78by5w20rxrrk4r87gic"; vendorSha256 = "sha256-rcbnyScD2GU1DLY6dTEPgFNXZfgkxXPn5lt6HRqa0d8=";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Terminal multiplexer inspired by i3"; description = "Terminal multiplexer inspired by i3";
longDescription = ''
3mux is a terminal multiplexer with out-of-the-box support for search,
mouse-controlled scrollback, and i3-like keybindings. Imagine tmux with a
smaller learning curve and more sane defaults.
'';
homepage = "https://github.com/aaronjanse/3mux"; homepage = "https://github.com/aaronjanse/3mux";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ aaronjanse filalex77 ]; maintainers = with maintainers; [ aaronjanse filalex77 ];
platforms = platforms.unix;
}; };
} }