diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-28 08:32:57 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-28 08:32:57 +0200 |
commit | 3685108787b28ba4592b994bbb6f9cded8f60b9c (patch) | |
tree | d02511707d6745be195f22a4a2bbfa55717ee229 /pkgs/misc | |
parent | dd12269b78a017a5075c89d1927fbf5f4b8bb4a9 (diff) | |
parent | 36a6746f2178141465761ce36de888389bc2968a (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/dumb/default.nix | 29 | ||||
-rw-r--r-- | pkgs/misc/emulators/xcpc/default.nix | 19 | ||||
-rw-r--r-- | pkgs/misc/ghostscript/default.nix | 10 | ||||
-rw-r--r-- | pkgs/misc/sndio/default.nix | 21 | ||||
-rw-r--r-- | pkgs/misc/vscode-extensions/default.nix | 8 | ||||
-rw-r--r-- | pkgs/misc/vscode-extensions/wakatime/default.nix | 4 |
6 files changed, 79 insertions, 12 deletions
diff --git a/pkgs/misc/dumb/default.nix b/pkgs/misc/dumb/default.nix new file mode 100644 index 0000000000000..36f6ca5b8c0cd --- /dev/null +++ b/pkgs/misc/dumb/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, allegro, SDL2 }: + +stdenv.mkDerivation rec { + name = "dumb-${version}"; + version = "2.0.3"; + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ allegro SDL2 ]; + + src = fetchFromGitHub { + owner = "kode54"; + repo = "dumb"; + rev = version; + sha256 = "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"; + }; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE='Release'" + "-DBUILD_EXAMPLES='OFF'" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/kode54/dumb"; + description = "Module/tracker based music format parser and player library"; + license = licenses.free; # Derivative of GPL + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/misc/emulators/xcpc/default.nix index 5eb6e3b160efb..3806d25e5d006 100644 --- a/pkgs/misc/emulators/xcpc/default.nix +++ b/pkgs/misc/emulators/xcpc/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, libdsk, pkgconfig, glib, libXaw, libX11, libXext, lesstif }: +{ stdenv, fetchurl, pkgconfig, glib, libXaw, libX11, libXext + , libDSKSupport ? true, libdsk + , motifSupport ? false, lesstif +}: +with stdenv.lib; stdenv.mkDerivation rec { version = "20070122"; - name = "xcpc-${version}"; + pname = "xcpc"; src = fetchurl { - url = "mirror://sourceforge/xcpc/${name}.tar.gz"; + url = "mirror://sourceforge/xcpc/${pname}-${version}.tar.gz"; sha256 = "0hxsbhmyzyyrlidgg0q8izw55q0z40xrynw5a1c3frdnihj9jf7n"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libdsk libXaw libX11 libXext lesstif ]; - meta = with stdenv.lib; { + buildInputs = [ glib libdsk libXaw libX11 libXext ] + ++ optional libDSKSupport libdsk + ++ optional motifSupport lesstif; + + meta = { description = "A portable Amstrad CPC 464/664/6128 emulator written in C"; - homepage = https://www.xcpc-emulator.net; + homepage = "https://www.xcpc-emulator.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index a12d7d7d5acdc..446aac629829d 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -51,6 +51,16 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61"; sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx"; }) + (fetchpatch { + name = "CVE-2019-3839-part-1"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=4ec9ca74bed49f2a82acb4bf430eae0d8b3b75c9"; + sha256 = "0gn1n9fq5msrxxzspidcnmykp1iv3yvx5485fddmgrslr52ngcf9"; + }) + (fetchpatch { + name = "CVE-2019-3839-part-2"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=db24f253409d5d085c2760c814c3e1d3fa2dac59"; + sha256 = "1h6kpwc6ryr6jlxjr6bfnvmmf8x0kqmyjlx3hggqjs23n0wsr9p9"; + }) ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix new file mode 100644 index 0000000000000..957acbaa4068a --- /dev/null +++ b/pkgs/misc/sndio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, alsaLib }: + +stdenv.mkDerivation rec { + name = "sndio-${version}"; + version = "1.2.0"; + enableParallelBuilding = true; + buildInputs = [ alsaLib ]; + + src = fetchurl { + url = "http://www.sndio.org/sndio-${version}.tar.gz"; + sha256 = "1p3cw7s6ylmvafbf9a5w5bkh3cy4s1d73hdh0i24m441jhc8x05r"; + }; + + meta = with stdenv.lib; { + homepage = "http://www.sndio.org"; + description = "Small audio and MIDI framework part of the OpenBSD project"; + license = licenses.isc; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index fb7e163dbe7f6..ec513c5a7b924 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -16,8 +16,8 @@ rec { mktplcRef = { name = "vscode-hie-server"; publisher = "alanz"; - version = "0.0.25"; # see the note above - sha256 = "0m21w03v94qxm0i54ki5slh6rg7610zfxinfpngr0hfpgw2nnxvc"; + version = "0.0.27"; # see the note above + sha256 = "1mz0h5zd295i73hbji9ivla8hx02i4yhqcv6l4r23w3f07ql3i8h"; }; meta = { license = stdenv.lib.licenses.mit; @@ -52,8 +52,8 @@ rec { mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "2.5.0"; # see the note above - sha256 = "10jqj8qw5x6da9l8zhjbra3xcbrwb4cpwc3ygsy29mam5pd8g6b3"; + version = "2.6.0"; # see the note above + sha256 = "1891pg4x5qkh151pylvn93c4plqw6vgasa4g40jbma5xzq8pygr4"; }; meta = { license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 6d8e59ba095ce..7a8a097b8d427 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "2.1.1"; - sha256 = "14qy073dfw0b4mk76l17il65r44jrz7pn1hvlj84562qp48b8skz"; + version = "2.1.2"; + sha256 = "1cdxmqdz8h9snx25cm3phipxdhjbcn38yfab09in661nr768vrkv"; }; postPatch = '' |