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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-11-08 00:02:29 +00:00 committed by GitHub
commit aa164b77b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
190 changed files with 2722 additions and 2061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/programs/neovim.nix
View File

@ -41,7 +41,19 @@ in {
withRuby = mkOption { withRuby = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
description = "Enable ruby provider."; description = "Enable Ruby provider.";
};
withPython3 = mkOption {
type = types.bool;
default = true;
description = "Enable Python 3 provider.";
};
withNodeJs = mkOption {
type = types.bool;
default = false;
description = "Enable Node provider.";
}; };
configure = mkOption { configure = mkOption {
@ -142,7 +154,7 @@ in {
environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim"); environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");
programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package { programs.neovim.finalPackage = pkgs.wrapNeovim cfg.package {
inherit (cfg) viAlias vimAlias; inherit (cfg) viAlias vimAlias withPython3 withNodeJs withRuby;
configure = cfg.configure // { configure = cfg.configure // {
customRC = (cfg.configure.customRC or "") + '' customRC = (cfg.configure.customRC or "") + ''

17
pkgs/applications/audio/aumix/default.nix
View File

@ -1,19 +1,26 @@
{lib, stdenv, fetchurl, gettext, ncurses { lib
, stdenv
, fetchurl
, gettext
, ncurses
, gtkGUI ? false , gtkGUI ? false
, pkg-config ? null , pkg-config ? null
, gtk2 ? null}: , gtk2 ? null
}:
assert gtkGUI -> pkg-config != null && gtk2 != null; assert gtkGUI -> pkg-config != null && gtk2 != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "aumix-2.9.1"; pname = "aumix";
version = "2.9.1";
src = fetchurl { src = fetchurl {
url = "http://www.jpj.net/~trevor/aumix/releases/${name}.tar.bz2"; url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2";
sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj";
}; };
buildInputs = [ gettext ncurses ] buildInputs = [ gettext ncurses ]
++ (if gtkGUI then [pkg-config gtk2] else []); ++ lib.optionals gtkGUI [ pkg-config gtk2 ];
meta = { meta = {
description = "Audio mixer for X and the console"; description = "Audio mixer for X and the console";

20
pkgs/applications/audio/clerk/default.nix
View File

@ -1,8 +1,18 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl, { lib
util-linux, python3Packages, libnotify }: , stdenv
, fetchFromGitHub
, makeWrapper
, rofi
, mpc_cli
, perl
, util-linux
, python3Packages
, libnotify
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "clerk-2016-10-14"; pname = "clerk";
version = "unstable-2016-10-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "carnager"; owner = "carnager";
@ -26,8 +36,8 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "An MPD client built on top of rofi"; description = "An MPD client built on top of rofi";
homepage = "https://github.com/carnager/clerk"; homepage = "https://github.com/carnager/clerk";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ anderspapitto ]; maintainers = with maintainers; [ anderspapitto ];
}; };
} }

5
pkgs/applications/audio/espeak/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, unzip, portaudio }: { lib, stdenv, fetchurl, unzip, portaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "espeak-1.48.04"; pname = "espeak";
version = "1.48.04";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/espeak/${name}-source.zip"; url = "mirror://sourceforge/espeak/espeak-${version}-source.zip";
sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz";
}; };

5
pkgs/applications/audio/espeak/edit.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: { lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "espeakedit-1.48.03"; pname = "espeakedit";
version = "1.48.03";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/espeak/${name}.zip"; url = "mirror://sourceforge/espeak/espeakedit-${version}.zip";
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
}; };

32
pkgs/applications/audio/nootka/unstable.nix
View File

@ -1,20 +1,38 @@
{ lib, stdenv, fetchurl, cmake { lib
, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch , stdenv
, qtbase, qtdeclarative, qtquickcontrols2 , fetchurl
, cmake
, alsa-lib
, fftwSinglePrec
, libjack2
, libpulseaudio
, libvorbis
, soundtouch
, qtbase
, qtdeclarative
, qtquickcontrols2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nootka-1.7.0-beta1"; pname = "nootka";
version = "1.7.0-beta1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/nootka/${name}-source.tar.bz2"; url = "mirror://sourceforge/nootka/nootka-${version}-source.tar.bz2";
sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc"; sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch alsa-lib
qtbase qtdeclarative qtquickcontrols2 fftwSinglePrec
libjack2
libpulseaudio
libvorbis
soundtouch
qtbase
qtdeclarative
qtquickcontrols2
]; ];
dontWrapQtApps = true; dontWrapQtApps = true;

8
pkgs/applications/audio/paprefs/default.nix
View File

@ -1,5 +1,6 @@
{ fetchurl { fetchurl
, lib, stdenv , lib
, stdenv
, meson , meson
, ninja , ninja
, gettext , gettext
@ -11,10 +12,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "paprefs-1.1"; pname = "paprefs";
version = "1.1";
src = fetchurl { src = fetchurl {
url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; url = "https://freedesktop.org/software/pulseaudio/paprefs/paprefs-${version}.tar.xz";
sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf"; sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf";
}; };

4
pkgs/applications/audio/wavegain/default.nix
View File

@ -1,7 +1,9 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wavegain-1.3.1"; pname = "wavegain";
version = "1.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MestreLion"; owner = "MestreLion";
repo = "wavegain"; repo = "wavegain";

7
pkgs/applications/backup/areca/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: { lib, stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "areca-7.5"; pname = "areca";
version = "7.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; url = "mirror://sourceforge/project/areca/areca-stable/areca-${version}/areca-${version}-src.tar.gz";
sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb"; sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb";
}; };

31
pkgs/applications/editors/bluefish/default.nix
View File

@ -1,24 +1,41 @@
{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 { lib
, enchant, gucharmap, python3, gnome , stdenv
, fetchurl
, intltool
, wrapGAppsHook
, pkg-config
, gtk
, libxml2
, enchant
, gucharmap
, python3
, gnome
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bluefish-2.2.12"; pname = "bluefish";
version = "2.2.12";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2";
sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d";
}; };
nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ];
buildInputs = [ gnome.adwaita-icon-theme gtk libxml2 buildInputs = [
enchant gucharmap python3 ]; gnome.adwaita-icon-theme
gtk
libxml2
enchant
gucharmap
python3
];
meta = with lib; { meta = with lib; {
description = "A powerful editor targeted towards programmers and webdevelopers"; description = "A powerful editor targeted towards programmers and webdevelopers";
homepage = "http://bluefish.openoffice.nl/"; homepage = "http://bluefish.openoffice.nl/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = [maintainers.vbgl]; maintainers = with maintainers; [ vbgl ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

17
pkgs/applications/editors/elvis/default.nix
View File

@ -1,19 +1,22 @@
{ fetchurl, fetchpatch, lib, stdenv, ncurses }: { fetchurl, fetchpatch, lib, stdenv, ncurses }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "elvis-2.2_0"; pname = "elvis";
version = "2.2_0";
src = fetchurl { src = fetchurl {
url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz"; url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz";
sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ];
patches = [ (fetchpatch { patches = [
url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; (fetchpatch {
sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch";
}) ]; sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc";
})
];
postPatch = '' postPatch = ''
substituteInPlace configure \ substituteInPlace configure \

5
pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix
View File

@ -1,10 +1,11 @@
{ lib, fetchurl, stdenv, emacs, python }: { lib, fetchurl, stdenv, emacs, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cedet-1.1"; pname = "cedet";
version = "1.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/cedet/${name}.tar.gz"; url = "mirror://sourceforge/cedet/cedet-${version}.tar.gz";
sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22"; sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22";
}; };

18
pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix
View File

@ -1,14 +1,15 @@
{stdenv, fetchurl, emacs}: { stdenv, fetchurl, emacs }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "session-management-for-emacs-2.2a"; pname = "session-management-for-emacs";
version = "2.2a";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz";
sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144";
}; };
buildInputs = [emacs]; buildInputs = [ emacs ];
installPhase = '' installPhase = ''
mkdir -p "$out/share/emacs/site-lisp" mkdir -p "$out/share/emacs/site-lisp"
@ -16,10 +17,9 @@ stdenv.mkDerivation {
''; '';
meta = { meta = {
/* installation: add to your ~/.emacs # installation: add to your ~/.emacs
(require 'session) # (require 'session)
(add-hook 'after-init-hook 'session-initialize) # (add-hook 'after-init-hook 'session-initialize)
*/
description = "Small session management for emacs"; description = "Small session management for emacs";
homepage = "http://emacs-session.sourceforge.net/"; homepage = "http://emacs-session.sourceforge.net/";
license = "GPL"; license = "GPL";

3
pkgs/applications/editors/fte/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }: { lib, stdenv, fetchurl, unzip, perl, libX11, libXpm, gpm, ncurses, slang }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fte-0.50.02"; pname = "fte";
version = "0.50.02";
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
buildInputs = [ perl libX11 libXpm gpm ncurses slang ]; buildInputs = [ perl libX11 libXpm gpm ncurses slang ];

5
pkgs/applications/editors/kile/default.nix
View File

@ -22,10 +22,11 @@
}: }:
mkDerivation rec { mkDerivation rec {
name = "kile-2.9.93"; pname = "kile";
version = "2.9.93";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/kile/${name}.tar.bz2"; url = "mirror://sourceforge/kile/kile-${version}.tar.bz2";
sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA="; sha256 = "BEmSEv/LJPs6aCkUmnyuTGrV15WYXwgIANbfcviMXfA=";
}; };

18
pkgs/applications/editors/sublime/2/default.nix
View File

@ -1,26 +1,28 @@
{ fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: { fetchurl, lib, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }:
let let
libPath = lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; libPath = lib.makeLibraryPath [ glib xorg.libX11 gtk2 cairo ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sublimetext-2.0.2"; pname = "sublimetext";
version = "2.0.2";
src = src =
if stdenv.hostPlatform.system == "i686-linux" then if stdenv.hostPlatform.system == "i686-linux" then
fetchurl { fetchurl {
name = "sublimetext-2.0.2.tar.bz2"; name = "sublimetext-${version}.tar.bz2";
urls = [ urls = [
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
"https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" "https://download.sublimetext.com/Sublime%20Text%20${version}.tar.bz2"
]; ];
sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7"; sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7";
} }
else else
fetchurl { fetchurl {
name = "sublimetext-2.0.2.tar.bz2"; name = "sublimetext-${version}.tar.bz2";
urls = [ urls = [
"http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%20${version}.tar.bz2"
"https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" "https://download.sublimetext.com/Sublime%20Text%20${version}%20x64.tar.bz2"
]; ];
sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1"; sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1";
}; };

9
pkgs/applications/graphics/autopanosiftc/default.nix
View File

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: { lib, stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "autopano-sift-C-2.5.1"; pname = "autopano-sift-C";
version = "2.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz"; url = "mirror://sourceforge/hugin/autopano-sift-C-${version}.tar.gz";
sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s";
}; };

3
pkgs/applications/graphics/autotrace/autofig.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "autofig-0.1"; pname = "autofig";
version = "0.1";
src = fetchurl { src = fetchurl {
url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz"; url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz";

13
pkgs/applications/graphics/comical/default.nix
View File

@ -1,13 +1,16 @@
{lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: { lib, stdenv, fetchurl, wxGTK, util-linux, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "comical-0.8"; pname = "comical";
version = "0.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/comical/${name}.tar.gz"; url = "mirror://sourceforge/comical/comical-${version}.tar.gz";
sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e";
}; };
buildInputs = [ wxGTK util-linux zlib ]; buildInputs = [ wxGTK util-linux zlib ];
preBuild="makeFlags=\"prefix=$out\""; makeFlags = [ "prefix=${placeholder "out"}" ];
patches = [ ./wxgtk-2.8.patch ]; patches = [ ./wxgtk-2.8.patch ];
@ -17,7 +20,7 @@ stdenv.mkDerivation rec {
description = "Viewer of CBR and CBZ files, often used to store scanned comics"; description = "Viewer of CBR and CBZ files, often used to store scanned comics";
homepage = "http://comical.sourceforge.net/"; homepage = "http://comical.sourceforge.net/";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [viric]; maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

7
pkgs/applications/graphics/exrdisplay/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }: { lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name ="openexr_viewers-2.2.1"; pname = "openexr_viewers";
version = "2.2.1";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/openexr/openexr_viewers-2.2.1.tar.gz"; url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz";
sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8"; sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
}; };

49
pkgs/applications/graphics/fbida/default.nix
View File

@ -1,12 +1,33 @@
{ lib, stdenv, fetchurl, libjpeg, libexif, giflib, libtiff, libpng, libwebp, libdrm { lib
, pkg-config, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm , stdenv
, epoxy, poppler, mesa, lirc }: , fetchurl
, libjpeg
, libexif
, giflib
, libtiff
, libpng
, libwebp
, libdrm
, pkg-config
, freetype
, fontconfig
, which
, imagemagick
, curl
, sane-backends
, libXpm
, epoxy
, poppler
, mesa
, lirc
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fbida-2.14"; pname = "fbida";
version = "2.14";
src = fetchurl { src = fetchurl {
url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; url = "http://dl.bytesex.org/releases/fbida/fbida-${version}.tar.gz";
sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm";
}; };
@ -21,8 +42,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config which ]; nativeBuildInputs = [ pkg-config which ];
buildInputs = [ buildInputs = [
libexif libjpeg libpng giflib freetype fontconfig libtiff libwebp libexif
imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc libjpeg
libpng
giflib
freetype
fontconfig
libtiff
libwebp
imagemagick
curl
sane-backends
libdrm
libXpm
epoxy
poppler
lirc
mesa mesa
]; ];

23
pkgs/applications/graphics/freepv/default.nix
View File

@ -1,11 +1,24 @@
{ lib, stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng, { lib
libXxf86vm }: , stdenv
, fetchurl
, libjpeg
, libGLU
, libGL
, freeglut
, zlib
, cmake
, libX11
, libxml2
, libpng
, libXxf86vm
}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "freepv-0.3.0"; pname = "freepv";
version = "0.3.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/freepv/freepv-0.3.0.tar.gz"; url = "mirror://sourceforge/freepv/freepv-${version}.tar.gz";
sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
}; };

5
pkgs/applications/graphics/gocr/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, tk }: { lib, stdenv, fetchurl, tk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gocr-0.52"; pname = "gocr";
version = "0.52";
src = fetchurl { src = fetchurl {
url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; url = "https://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${version}.tar.gz";
sha256 = "11l6gds1lrm8lwrrsxnm5fjlwz8q1xbh896cprrl4psz21in946z"; sha256 = "11l6gds1lrm8lwrrsxnm5fjlwz8q1xbh896cprrl4psz21in946z";
}; };

13
pkgs/applications/graphics/gpicview/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gpicview-0.2.4"; pname = "gpicview";
version = "0.2.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/lxde/gpicview-0.2.4.tar.gz"; url = "mirror://sourceforge/lxde/gpicview-${version}.tar.gz";
sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr"; sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr";
}; };
@ -17,11 +18,11 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "A simple and fast image viewer for X"; description = "A simple and fast image viewer for X";
homepage = "http://lxde.sourceforge.net/gpicview/"; homepage = "http://lxde.sourceforge.net/gpicview/";
repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ lovek323 ]; maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

11
pkgs/applications/graphics/gqview/default.nix
View File

@ -1,20 +1,21 @@
{lib, stdenv, fetchurl, pkg-config, gtk2, libpng}: { lib, stdenv, fetchurl, pkg-config, gtk2, libpng }:
assert pkg-config != null && gtk2 != null && libpng != null; assert pkg-config != null && gtk2 != null && libpng != null;
# Note that we cannot just copy gtk's png attribute, since gtk might # Note that we cannot just copy gtk's png attribute, since gtk might
# not be linked against png. # not be linked against png.
# !!! assert libpng == gtk2.libpng; # !!! assert libpng == gtk2.libpng;
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gqview-2.1.5"; pname = "gqview";
version = "2.1.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gqview/gqview-2.1.5.tar.gz"; url = "mirror://sourceforge/gqview/gqview-${version}.tar.gz";
sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 libpng]; buildInputs = [ gtk2 libpng ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

71
pkgs/applications/graphics/hugin/default.nix
View File

@ -1,14 +1,46 @@
{ lib, stdenv, cmake, fetchurl, gnumake, makeWrapper, pkg-config, fetchpatch { lib
, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , stdenv
, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , cmake
, libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib , fetchurl
, gnumake
, makeWrapper
, pkg-config
, fetchpatch
, autopanosiftc
, boost
, cairo
, enblend-enfuse
, exiv2
, fftw
, flann
, gettext
, glew
, ilmbase
, lcms2
, lensfun
, libjpeg
, libpng
, libtiff
, libX11
, libXi
, libXmu
, libGLU
, libGL
, openexr
, panotools
, perlPackages
, sqlite
, vigra
, wxGTK
, zlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hugin-2019.0.0"; pname = "hugin";
version = "2019.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2"; url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2";
sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr";
}; };
@ -21,9 +53,30 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg boost
libpng libtiff libX11 libXi libXmu libGLU libGL openexr panotools sqlite vigra cairo
wxGTK zlib exiv2
fftw
flann
gettext
glew
ilmbase
lcms2
lensfun
libjpeg
libpng
libtiff
libX11
libXi
libXmu
libGLU
libGL
openexr
panotools
sqlite
vigra
wxGTK
zlib
]; ];
nativeBuildInputs = [ cmake makeWrapper pkg-config ]; nativeBuildInputs = [ cmake makeWrapper pkg-config ];

12
pkgs/applications/graphics/minidjvu/default.nix
View File

@ -1,9 +1,11 @@
{lib, stdenv, fetchurl, libtiff, gettext }: { lib, stdenv, fetchurl, libtiff, gettext }:
stdenv.mkDerivation rec {
pname = "minidjvu";
version = "0.8";
stdenv.mkDerivation {
name = "minidjvu-0.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz"; url = "mirror://sourceforge/minidjvu/minidjvu-${version}.tar.gz";
sha256 = "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79"; sha256 = "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79";
}; };
@ -11,7 +13,7 @@ stdenv.mkDerivation {
sed -i s,/usr/bin/gzip,gzip, Makefile.in sed -i s,/usr/bin/gzip,gzip, Makefile.in
''; '';
buildInputs = [ libtiff gettext]; buildInputs = [ libtiff gettext ];
preInstall = '' preInstall = ''
mkdir -p $out/lib mkdir -p $out/lib

20
pkgs/applications/graphics/photivo/default.nix
View File

@ -1,8 +1,22 @@
{ lib, stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16, { lib
lcms2, lensfun, pkg-config, libjpeg, exiv2, liblqr1 }: , stdenv
, fetchhg
, fetchpatch
, cmake
, qt4
, fftw
, graphicsmagick_q16
, lcms2
, lensfun
, pkg-config
, libjpeg
, exiv2
, liblqr1
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "photivo-2014-01-25"; pname = "photivo";
version = "2014-01-25";
src = fetchhg { src = fetchhg {
url = "http://code.google.com/p/photivo/"; url = "http://code.google.com/p/photivo/";

34
pkgs/applications/graphics/pinta/default.nix
View File

@ -1,14 +1,18 @@
{ lib, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp, { lib
gettext }: , fetchFromGitHub
, buildDotnetPackage
, dotnetPackages
, gtksharp
, gettext
}:
let let
mono-addins = dotnetPackages.MonoAddins; mono-addins = dotnetPackages.MonoAddins;
in in
buildDotnetPackage rec { buildDotnetPackage rec {
name = "pinta-1.6";
baseName = "Pinta"; baseName = "Pinta";
version = "1.6"; version = "1.6";
outputFiles = [ "bin/*" ]; outputFiles = [ "bin/*" ];
buildInputs = [ gtksharp mono-addins gettext ]; buildInputs = [ gtksharp mono-addins gettext ];
xBuildFiles = [ "Pinta.sln" ]; xBuildFiles = [ "Pinta.sln" ];
@ -37,23 +41,25 @@ buildDotnetPackage rec {
"Mono\\.Addins\\.Setup" "Mono\\.Addins\\.Setup"
]; ];
stripVersion = name: file: let stripVersion = name: file:
let
match = ''<Reference Include="${name}([ ,][^"]*)?"''; match = ''<Reference Include="${name}([ ,][^"]*)?"'';
replace = ''<Reference Include="${name}"''; replace = ''<Reference Include="${name}"'';
in "sed -i -re 's/${match}/${replace}/g' ${file}\n"; in
"sed -i -re 's/${match}/${replace}/g' ${file}\n";
# Map all possible pairs of two lists # Map all possible pairs of two lists
map2 = f: listA: listB: concatMap (a: map (f a) listB) listA; map2 = f: listA: listB: concatMap (a: map (f a) listB) listA;
concatMap2Strings = f: listA: listB: concatStrings (map2 f listA listB); concatMap2Strings = f: listA: listB: concatStrings (map2 f listA listB);
in in
concatMap2Strings stripVersion versionedNames csprojFiles concatMap2Strings stripVersion versionedNames csprojFiles
+ '' + ''
# For some reason there is no Microsoft.Common.tasks file # For some reason there is no Microsoft.Common.tasks file
# in ''${mono}/lib/mono/3.5 . # in ''${mono}/lib/mono/3.5 .
substituteInPlace Pinta.Install.proj \ substituteInPlace Pinta.Install.proj \
--replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \ --replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \
--replace "/usr/local" "$out" --replace "/usr/local" "$out"
''; '';
makeWrapperArgs = [ makeWrapperArgs = [
"--prefix MONO_GAC_PREFIX : ${gtksharp}" "--prefix MONO_GAC_PREFIX : ${gtksharp}"

5
pkgs/applications/graphics/qscreenshot/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }: { lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qscreenshot-1.0"; pname = "qscreenshot";
version = "1.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qscreenshot/${name}-src.tar.gz"; url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz";
sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx";
}; };

7
pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: { lib, stdenv, fetchurl, libsaneUDevRuleNumber ? "49" }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "brother-udev-rule-type1-1.0.0-1"; pname = "brother-udev-rule-type1";
version = "1.0.0-1";
src = fetchurl { src = fetchurl {
url = "http://download.brother.com/welcome/dlf006654/${name}.all.deb"; url = "http://download.brother.com/welcome/dlf006654/brother-udev-rule-type1-${version}.all.deb";
sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi"; sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi";
}; };

22
pkgs/applications/graphics/sane/xsane.nix
View File

@ -1,15 +1,25 @@
{ lib, stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkg-config, libpng { lib
, stdenv
, fetchurl
, sane-backends
, sane-frontends
, libX11
, gtk2
, pkg-config
, libpng
, libusb-compat-0_1 ? null , libusb-compat-0_1 ? null
, gimpSupport ? false, gimp ? null , gimpSupport ? false
, gimp ? null
}: }:
assert gimpSupport -> gimp != null; assert gimpSupport -> gimp != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xsane-0.999"; pname = "xsane";
version = "0.999";
src = fetchurl { src = fetchurl {
url = "http://www.xsane.org/download/${name}.tar.gz"; url = "http://www.xsane.org/download/xsane-${version}.tar.gz";
sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp";
}; };
@ -19,8 +29,8 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] buildInputs = [ libpng sane-backends sane-frontends libX11 gtk2 ]
++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) ++ (if libusb-compat-0_1 != null then [ libusb-compat-0_1 ] else [ ])
++ lib.optional gimpSupport gimp; ++ lib.optional gimpSupport gimp;
meta = { meta = {

9
pkgs/applications/graphics/scantailor/default.nix
View File

@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }: { lib, stdenv, fetchurl, qt4, cmake, libjpeg, libtiff, boost }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "scantailor-0.9.12.1"; pname = "scantailor";
version = "0.9.12.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/scantailor/scantailor/archive/RELEASE_0_9_12_1.tar.gz"; url = "https://github.com/scantailor/scantailor/archive/RELEASE_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg"; sha256 = "1pjx3a6hs16az6rki59bchy3biy7jndjx8r125q01aq7lbf5npgg";
}; };

16
pkgs/applications/graphics/wings/default.nix
View File

@ -1,9 +1,11 @@
{ fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: { fetchurl, lib, stdenv, erlang, cl, libGL, libGLU, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wings-2.2.4"; pname = "wings";
version = "2.2.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/wings/${name}.tar.bz2"; url = "mirror://sourceforge/wings/wings-${version}.tar.bz2";
sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3"; sha256 = "1xcmifs4vq2810pqqvsjsm8z3lz24ys4c05xkh82nyppip2s89a3";
}; };
@ -24,13 +26,13 @@ stdenv.mkDerivation rec {
# I did not test the *cl* part. I added the -pa just by imitation. # I did not test the *cl* part. I added the -pa just by imitation.
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/lib/${name}/ebin mkdir -p $out/bin $out/lib/wings-${version}/ebin
cp ebin/* $out/lib/${name}/ebin cp ebin/* $out/lib/wings-${version}/ebin
cp -R textures shaders plugins $out/lib/$name cp -R textures shaders plugins $out/lib/wings-${version}
cat << EOF > $out/bin/wings cat << EOF > $out/bin/wings
#!${runtimeShell} #!${runtimeShell}
${erlang}/bin/erl \ ${erlang}/bin/erl \
-pa $out/lib/${name}/ebin -run wings_start start_halt "$@" -pa $out/lib/wings-${version}/ebin -run wings_start start_halt "$@"
EOF EOF
chmod +x $out/bin/wings chmod +x $out/bin/wings
''; '';
@ -39,7 +41,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.wings3d.com/"; homepage = "http://www.wings3d.com/";
description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
license = lib.licenses.tcltk; license = lib.licenses.tcltk;
maintainers = with lib.maintainers; [viric]; maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

2
pkgs/applications/kde/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.2/src -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/release-service/21.08.3/src -A '*.tar.xz' )

1808
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

13
pkgs/applications/misc/abook/default.nix
View File

@ -1,19 +1,20 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }: { lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "abook-0.6.1"; pname = "abook";
version = "0.6.1";
src = fetchurl { src = fetchurl {
url = "http://abook.sourceforge.net/devel/${name}.tar.gz"; url = "http://abook.sourceforge.net/devel/abook-${version}.tar.gz";
sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh"; sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook"; url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook";
name = "gcc5.patch"; name = "gcc5.patch";
sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn"; sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn";
}) })
]; ];
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];

28
pkgs/applications/misc/adobe-reader/default.nix
View File

@ -1,17 +1,31 @@
{ lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib { lib
, gdk-pixbuf, gdk-pixbuf-xlib }: , stdenv
, fetchurl
, libX11
, cups
, zlib
, libxml2
, pango
, atk
, gtk2
, glib
, gdk-pixbuf
, gdk-pixbuf-xlib
}:
assert stdenv.hostPlatform.system == "i686-linux"; assert stdenv.hostPlatform.system == "i686-linux";
let version = "9.5.5"; in let
baseVersion = "9.5.5";
stdenv.mkDerivation { in
name = "adobe-reader-${version}-1"; stdenv.mkDerivation rec {
pname = "adobe-reader";
version = "${baseVersion}-1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${version}/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2"; url = "http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${baseVersion}/enu/AdbeRdr${version}_i486linux_enu.tar.bz2";
sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf"; sha256 = "0h35misxrqkl5zlmmvray1bqf4ywczkm89n9qw7d9arqbg3aj3pf";
}; };

52
pkgs/applications/misc/audio/sox/default.nix
View File

@ -1,26 +1,46 @@
{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio { config
, enableAlsa ? true, alsa-lib ? null , lib
, enableLibao ? true, libao ? null , stdenv
, enableLame ? config.sox.enableLame or false, lame ? null , fetchurl
, enableLibmad ? true, libmad ? null , pkg-config
, enableLibogg ? true, libogg ? null, libvorbis ? null , CoreAudio
, enableOpusfile ? true, opusfile ? null , enableAlsa ? true
, enableFLAC ? true, flac ? null , alsa-lib ? null
, enablePNG ? true, libpng ? null , enableLibao ? true
, enableLibsndfile ? true, libsndfile ? null , libao ? null
, enableWavpack ? true, wavpack ? null , enableLame ? config.sox.enableLame or false
# amrnb and amrwb are unfree, disabled by default , lame ? null
, enableAMR ? false, amrnb ? null, amrwb ? null , enableLibmad ? true
, enableLibpulseaudio ? true, libpulseaudio ? null , libmad ? null
, enableLibogg ? true
, libogg ? null
, libvorbis ? null
, enableOpusfile ? true
, opusfile ? null
, enableFLAC ? true
, flac ? null
, enablePNG ? true
, libpng ? null
, enableLibsndfile ? true
, libsndfile ? null
, enableWavpack ? true
, wavpack ? null
# amrnb and amrwb are unfree, disabled by default
, enableAMR ? false
, amrnb ? null
, amrwb ? null
, enableLibpulseaudio ? true
, libpulseaudio ? null
}: }:
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sox-14.4.2"; pname = "sox";
version = "14.4.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/sox/${name}.tar.gz"; url = "mirror://sourceforge/sox/sox-${version}.tar.gz";
sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl";
}; };

7
pkgs/applications/misc/audio/wavesurfer/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }: { lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "wavesurfer-1.8.5"; pname = "wavesurfer";
version = "1.8.5";
src = fetchurl { src = fetchurl {
url = "https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz"; url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz";
sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
}; };

21
pkgs/applications/misc/audio/wavrsocvt/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wavrsocvt-1.0.2.0"; pname = "wavrsocvt";
version = "1.0.2.0";
src = fetchurl { src = fetchurl {
url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz"; url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz";
@ -10,23 +11,23 @@ stdenv.mkDerivation {
unpackPhase = '' unpackPhase = ''
tar -zxf $src tar -zxf $src
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp wavrsocvt $out/bin cp wavrsocvt $out/bin
''; '';
meta = with lib; { meta = with lib; {
description = "Convert .wav files into sound files for Lego NXT brick"; description = "Convert .wav files into sound files for Lego NXT brick";
longDescription = '' longDescription = ''
wavrsocvt is a command-line utility which can be used from a wavrsocvt is a command-line utility which can be used from a
terminal window or script to convert .wav files into sound terminal window or script to convert .wav files into sound
files for the NXT brick (.rso files). It can also convert the files for the NXT brick (.rso files). It can also convert the
other direction (i.e., .rso -> .wav). It can produce RSO files other direction (i.e., .rso -> .wav). It can produce RSO files
with a sample rate between 2000 and 16000 (the min/max range of with a sample rate between 2000 and 16000 (the min/max range of
supported sample rates in the standard NXT firmware). supported sample rates in the standard NXT firmware).
You can then upload these with e.g. nxt-python. You can then upload these with e.g. nxt-python.
''; '';
homepage = "http://bricxcc.sourceforge.net/"; homepage = "http://bricxcc.sourceforge.net/";
license = licenses.mpl11; license = licenses.mpl11;

3
pkgs/applications/misc/avrdudess/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }: { lib, stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg-utils }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "avrdudess-2.2.20140102"; pname = "avrdudess";
version = "2.2.20140102";
src = fetchurl { src = fetchurl {
url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip"; url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip";

3
pkgs/applications/misc/catclock/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: { lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "catclock-2015-10-04"; pname = "catclock";
version = "unstable-2015-10-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BarkyTheDog"; owner = "BarkyTheDog";

2
pkgs/applications/misc/cherrytree/default.nix
View File

@ -13,7 +13,6 @@
, sqlite , sqlite
, curl , curl
, libuchardet , libuchardet
, fmt
, spdlog , spdlog
}: }:
@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
sqlite sqlite
curl curl
libuchardet libuchardet
fmt
spdlog spdlog
]; ];

5
pkgs/applications/misc/colort/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "colort-unstable-2017-03-12"; pname = "colort";
version = "unstable-2017-03-12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neeasade"; owner = "neeasade";
@ -10,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw"; sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw";
}; };
makeFlags = ["PREFIX=$(out)"]; makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; { meta = with lib; {
description = "A program for 'tinting' color values"; description = "A program for 'tinting' color values";

5
pkgs/applications/misc/ding/default.nix
View File

@ -10,10 +10,11 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ding-1.9"; pname = "ding";
version = "1.9";
src = fetchurl { src = fetchurl {
url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/ding-${version}.tar.gz";
sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU=";
}; };

15
pkgs/applications/misc/dmenu/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: { lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dmenu-5.0"; pname = "dmenu";
version = "5.0";
src = fetchurl { src = fetchurl {
url = "https://dl.suckless.org/tools/${name}.tar.gz"; url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz";
sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y";
}; };
@ -24,10 +25,10 @@ stdenv.mkDerivation rec {
makeFlags = [ "CC:=$(CC)" ]; makeFlags = [ "CC:=$(CC)" ];
meta = with lib; { meta = with lib; {
description = "A generic, highly customizable, and efficient menu for the X Window System"; description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = "https://tools.suckless.org/dmenu"; homepage = "https://tools.suckless.org/dmenu";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ pSub globin ]; maintainers = with maintainers; [ pSub globin ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

4
pkgs/applications/misc/far2l/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
, xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: , libuchardet, spdlog, xercesc, openssl, libssh, samba, neon, libnfs, libarchive }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "far2l"; pname = "far2l";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];
buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc ] # base requirements of the build
++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats
#++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below #++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below

33
pkgs/applications/misc/fbreader/default.nix
View File

@ -1,9 +1,21 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config { lib
, bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib , stdenv
, fetchFromGitHub
, fetchpatch
, pkg-config
, bzip2
, curl
, expat
, fribidi
, libunibreak
, sqlite
, zlib
, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx"
, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa"
, qt4, gtk2 , qt4
, AppKit, Cocoa , gtk2
, AppKit
, Cocoa
}: }:
with lib; with lib;
@ -16,7 +28,8 @@ assert uiTarget == "macosx" -> uiType == "cocoa";
# which is way to old and no longer in nixpkgs. # which is way to old and no longer in nixpkgs.
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fbreader-${uiType}-0.99.6"; pname = "fbreader-${uiType}";
version = "0.99.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "geometer"; owner = "geometer";
@ -53,7 +66,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
bzip2 curl expat fribidi libunibreak sqlite zlib bzip2
curl
expat
fribidi
libunibreak
sqlite
zlib
] ]
++ optional (uiType == "qt4") qt4 ++ optional (uiType == "qt4") qt4
++ optional (uiType == "gtk") gtk2 ++ optional (uiType == "gtk") gtk2
@ -68,7 +87,7 @@ stdenv.mkDerivation {
homepage = "http://www.fbreader.org/"; homepage = "http://www.fbreader.org/";
license = licenses.gpl3; license = licenses.gpl3;
broken = stdenv.isDarwin # untested, might work broken = stdenv.isDarwin # untested, might work
|| uiType == "gtk"; # builds, but the result is unusable, hangs a lot || uiType == "gtk"; # builds, but the result is unusable, hangs a lot
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.coroa ]; maintainers = [ maintainers.coroa ];
}; };

3
pkgs/applications/misc/fehlstart/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }: { lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fehlstart-9f4342d7"; pname = "fehlstart";
version = "unstable-2016-05-23";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "fehlstart"; owner = "fehlstart";

10
pkgs/applications/misc/garmin-plugin/default.nix
View File

@ -1,11 +1,13 @@
{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: { lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "garmin-plugin-0.3.26"; pname = "garmin-plugin";
version = "0.3.26";
src = fetchurl { src = fetchurl {
url = "https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz"; url = "https://github.com/adiesner/GarminPlugin/archive/V${version}.tar.gz";
sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0";
}; };
sourceRoot = "GarminPlugin-0.3.26/src"; sourceRoot = "GarminPlugin-${version}/src";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ];
configureFlags = [ configureFlags = [

24
pkgs/applications/misc/gkrellm/default.nix
View File

@ -1,19 +1,33 @@
{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which { lib
, IOKit, copyDesktopItems, makeDesktopItem, wrapGAppsHook , fetchurl
, stdenv
, gettext
, pkg-config
, glib
, gtk2
, libX11
, libSM
, libICE
, which
, IOKit
, copyDesktopItems
, makeDesktopItem
, wrapGAppsHook
}: }:
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gkrellm-2.3.11"; pname = "gkrellm";
version = "2.3.11";
src = fetchurl { src = fetchurl {
url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2"; url = "http://gkrellm.srcbox.net/releases/gkrellm-${version}.tar.bz2";
sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y";
}; };
nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ];
buildInputs = [gettext glib gtk2 libX11 libSM libICE] buildInputs = [ gettext glib gtk2 libX11 libSM libICE ]
++ optionals stdenv.isDarwin [ IOKit ]; ++ optionals stdenv.isDarwin [ IOKit ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

5
pkgs/applications/misc/gpa/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpg-error, libassuan }: { lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpg-error, libassuan }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpa-0.10.0"; pname = "gpa";
version = "0.10.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gpa/${name}.tar.bz2"; url = "mirror://gnupg/gpa/gpa-${version}.tar.bz2";
sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm";
}; };

5
pkgs/applications/misc/grip/default.nix
View File

@ -15,10 +15,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "grip-4.2.2"; pname = "grip";
version = "4.2.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/grip/${name}.tar.gz"; url = "mirror://sourceforge/grip/grip-${version}.tar.gz";
sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE="; sha256 = "sha256-nXtGgJeNYM8lyllNi9UdmsnVcHOCXfryWmKGZ9QFTHE=";
}; };

10
pkgs/applications/misc/gv/default.nix
View File

@ -1,13 +1,11 @@
{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: { lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }:
let stdenv.mkDerivation rec {
name = "gv-3.7.4"; pname = "gv";
in version = "3.7.4";
stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gv/${name}.tar.gz"; url = "mirror://gnu/gv/gv-${version}.tar.gz";
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
}; };

20
pkgs/applications/misc/gxneur/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: { lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gxneur-0.20.0"; pname = "gxneur";
version = "0.20.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz"; url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/${version}/gxneur_${version}.orig.tar.gz";
sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";
}; };
@ -13,8 +14,17 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config intltool ]; nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ buildInputs = [
xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur xorg.libX11
libglade GConf pcre libappindicator-gtk2 glib
gtk2
xorg.libXpm
xorg.libXt
xorg.libXext
xneur
libglade
GConf
pcre
libappindicator-gtk2
]; ];
meta = with lib; { meta = with lib; {

7
pkgs/applications/misc/jigdo/default.nix
View File

@ -1,11 +1,12 @@
{ lib, stdenv, fetchurl, db, gtk2, bzip2 }: { lib, stdenv, fetchurl, db, gtk2, bzip2 }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "jigdo-0.7.3"; pname = "jigdo";
version = "0.7.3";
# Debian sources # Debian sources
src = fetchurl { src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz"; url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz";
sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
}; };

3
pkgs/applications/misc/loxodo/default.nix
View File

@ -4,7 +4,8 @@ let
python = py.python; python = py.python;
in in
py.buildPythonApplication { py.buildPythonApplication {
name = "loxodo-0.20150124"; pname = "loxodo";
version = "0.20150124";
src = fetchgit { src = fetchgit {
url = "https://github.com/sommer/loxodo.git"; url = "https://github.com/sommer/loxodo.git";

11
pkgs/applications/misc/mencal/default.nix
View File

@ -1,17 +1,18 @@
{ lib, stdenv, fetchurl, perl }: { lib, stdenv, fetchurl, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mencal-3.0"; pname = "mencal";
version = "3.0";
src = fetchurl { src = fetchurl {
url = "http://kyberdigi.cz/projects/mencal/files/${name}.tar.gz"; url = "http://kyberdigi.cz/projects/mencal/files/mencal-${version}.tar.gz";
sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080"; sha256 = "9328d0b2f3f57847e8753c5184531f4832be7123d1b6623afdff892074c03080";
}; };
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp mencal $out/bin/ cp mencal $out/bin/
''; '';
buildInputs = [ perl ]; buildInputs = [ perl ];

3
pkgs/applications/misc/metar/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, curl }: { lib, stdenv, fetchgit, curl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "metar-20161013.1"; pname = "metar";
version = "20161013.1";
src = fetchgit { src = fetchgit {
url = "https://github.com/keesL/metar.git"; url = "https://github.com/keesL/metar.git";

3
pkgs/applications/misc/mpvc/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, socat, fetchFromGitHub, makeWrapper }: { lib, stdenv, socat, fetchFromGitHub, makeWrapper }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mpvc-unstable-2017-03-18"; pname = "mpvc";
version = "unstable-2017-03-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wildefyr"; owner = "wildefyr";

11
pkgs/applications/misc/navipowm/default.nix
View File

@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, qt4, qmake4Hook }: { lib, stdenv, fetchurl, qt4, qmake4Hook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "navipowm-0.2.4"; pname = "navipowm";
version = "0.2.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz"; url = "mirror://sourceforge/navipowm/NaviPOWM-${version}.tar.gz";
sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b";
}; };
@ -12,10 +13,10 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/share/${name}/Icons mkdir -p $out/bin $out/share/navipowm-${version}/Icons
cp bin/NaviPOWM $out/bin cp bin/NaviPOWM $out/bin
cp ../../common/Config/navipowm.ini $out/share/${name} cp ../../common/Config/navipowm.ini $out/share/navipowm-${version}
cp ../../common/Images/* $out/share/${name} cp ../../common/Images/* $out/share/navipowm-${version}
''; '';
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];

3
pkgs/applications/misc/openbrf/default.nix
View File

@ -2,7 +2,8 @@
mkDerivation { mkDerivation {
name = "openbrf-unstable-2016-01-09"; pname = "openbrf";
version = "unstable-2016-01-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cfcohen"; owner = "cfcohen";

23
pkgs/applications/misc/pcmanfm/default.nix
View File

@ -1,5 +1,18 @@
{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config { lib
, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }: , stdenv
, fetchurl
, glib
, intltool
, libfm
, libX11
, pango
, pkg-config
, wrapGAppsHook
, gnome
, withGtk3 ? true
, gtk2
, gtk3
}:
let let
libfm' = libfm.override { inherit withGtk3; }; libfm' = libfm.override { inherit withGtk3; };
@ -7,9 +20,11 @@ let
inherit (lib) optional; inherit (lib) optional;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcmanfm-1.3.2"; pname = "pcmanfm";
version = "1.3.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pcmanfm/${name}.tar.xz"; url = "mirror://sourceforge/pcmanfm/pcmanfm-${version}.tar.xz";
sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
}; };

7
pkgs/applications/misc/posterazor/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }: { lib, stdenv, fetchurl, cmake, unzip, pkg-config, libXpm, fltk13, freeimage }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "posterazor-1.5.1"; pname = "posterazor";
version = "1.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/posterazor/1.5.1/PosteRazor-1.5.1-Source.zip"; url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip";
sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5"; sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5";
}; };

21
pkgs/applications/misc/procmail/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "procmail-3.22"; pname = "procmail";
version = "3.22";
patches = [ patches = [
./CVE-2014-3618.patch ./CVE-2014-3618.patch
@ -15,17 +16,17 @@ stdenv.mkDerivation {
# getline is defined differently in glibc now. So rename it. # getline is defined differently in glibc now. So rename it.
# Without the .PHONY target "make install" won't install anything on Darwin. # Without the .PHONY target "make install" won't install anything on Darwin.
postPatch = '' postPatch = ''
sed -e "s%^RM.*$%#%" -i Makefile sed -e "s%^RM.*$%#%" -i Makefile
sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile
sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile
sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h
sed -e "3i\ sed -e "3i\
.PHONY: install .PHONY: install
" -i Makefile " -i Makefile
''; '';
src = fetchurl { src = fetchurl {
url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz"; url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-${version}.tar.gz";
sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
}; };

5
pkgs/applications/misc/ptask/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }: { lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ptask-1.0.0"; pname = "ptask";
version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://wpitchoune.net/ptask/files/${name}.tar.gz"; url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz";
sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
}; };

4
pkgs/applications/misc/rofi-menugen/default.nix
View File

@ -2,7 +2,9 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; rev = "168efd2608fdb88b1aff3e0244bda8402169f207";
name = "rofi-menugen-2015-12-28-${builtins.substring 0 7 rev}"; pname = "rofi-menugen";
version = "unstable-2015-12-28-${builtins.substring 0 7 rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "octotep"; owner = "octotep";
repo = "menugen"; repo = "menugen";

5
pkgs/applications/misc/sbagen/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sbagen-1.4.4"; pname = "sbagen";
version = "1.4.4";
src = fetchurl { src = fetchurl {
url = "https://uazu.net/sbagen/${name}.tgz"; url = "https://uazu.net/sbagen/sbagen-${version}.tgz";
sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2"; sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
}; };

7
pkgs/applications/misc/slade/git.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib
, stdenv
, fetchFromGitHub
, cmake , cmake
, pkg-config , pkg-config
, wxGTK , wxGTK
@ -15,7 +17,8 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "slade-git-3.2.0.2021.05.13"; pname = "slade";
version = "unstable-2021-05-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sirjuddington"; owner = "sirjuddington";

9
pkgs/applications/misc/speedread/default.nix
View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchFromGitHub, perl }: { lib, stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "speedread-unstable-2016-09-21"; pname = "speedread";
version = "unstable-2016-09-21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pasky"; owner = "pasky";
repo = "speedread"; repo = "speedread";
rev = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd"; rev = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd";
sha256 = "1h94jx3v18fdlc64lfmj2g5x63fjyqb8c56k5lihl7bva0xgdkxd"; sha256 = "1h94jx3v18fdlc64lfmj2g5x63fjyqb8c56k5lihl7bva0xgdkxd";
}; };

3
pkgs/applications/misc/stag/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, curses }: { lib, stdenv, fetchgit, curses }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "stag-1.0"; pname = "stag";
version = "1.0";
src = fetchgit { src = fetchgit {
url = "https://github.com/seenaburns/stag.git"; url = "https://github.com/seenaburns/stag.git";

3
pkgs/applications/misc/twmn/default.nix
View File

@ -1,7 +1,8 @@
{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }: { lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }:
mkDerivation { mkDerivation {
name = "twmn-git-2018-10-01"; pname = "twmn";
version = "unstable-2018-10-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sboli"; owner = "sboli";

3
pkgs/applications/misc/waybar/default.nix
View File

@ -10,7 +10,6 @@
, gtkmm3 , gtkmm3
, libsigcxx , libsigcxx
, jsoncpp , jsoncpp
, fmt
, scdoc , scdoc
, spdlog , spdlog
, gtk-layer-shell , gtk-layer-shell
@ -51,7 +50,7 @@ stdenv.mkDerivation rec {
strictDeps = false; strictDeps = false;
buildInputs = with lib; buildInputs = with lib;
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ] [ wayland wlroots gtkmm3 libsigcxx jsoncpp spdlog gtk-layer-shell howard-hinnant-date libxkbcommon ]
++ optional traySupport libdbusmenu-gtk3 ++ optional traySupport libdbusmenu-gtk3
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optional sndioSupport sndio ++ optional sndioSupport sndio

5
pkgs/applications/misc/wmname/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libX11 }: { lib, stdenv, fetchurl, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wmname-0.1"; pname = "wmname";
version = "0.1";
src = fetchurl { src = fetchurl {
url = "https://dl.suckless.org/tools/${name}.tar.gz"; url = "https://dl.suckless.org/tools/wmname-${version}.tar.gz";
sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5"; sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5";
}; };

11
pkgs/applications/misc/xcruiser/default.nix
View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }: { lib, stdenv, fetchurl, gccmakedep, imake, libXt, libXaw, libXpm, libXext }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "xcruiser-0.30"; pname = "xcruiser";
version = "0.30";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz"; url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-${version}/xcruiser-${version}.tar.gz";
sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
}; };
nativeBuildInputs = [ gccmakedep imake ]; nativeBuildInputs = [ gccmakedep imake ];
buildInputs = [ libXt libXaw libXpm libXext ]; buildInputs = [ libXt libXaw libXpm libXext ];

13
pkgs/applications/misc/xfe/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }: { lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xfe-1.42"; pname = "xfe";
version = "1.42";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xfe/${name}.tar.gz"; url = "mirror://sourceforge/xfe/xfe-${version}.tar.gz";
sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
}; };
@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = with lib; {
description = "MS-Explorer like file manager for X"; description = "MS-Explorer like file manager for X";
longDescription = '' longDescription = ''
X File Explorer (Xfe) is an MS-Explorer like file manager for X. X File Explorer (Xfe) is an MS-Explorer like file manager for X.
@ -25,8 +26,8 @@ stdenv.mkDerivation rec {
Xfe aims to be the filemanager of choice for all the Unix addicts! Xfe aims to be the filemanager of choice for all the Unix addicts!
''; '';
homepage = "https://sourceforge.net/projects/xfe/"; homepage = "https://sourceforge.net/projects/xfe/";
license = lib.licenses.gpl2; license = licenses.gpl2;
maintainers = []; maintainers = with maintainers; [ ];
platforms = lib.platforms.linux; platforms = platforms.linux;
}; };
} }

11
pkgs/applications/misc/xfontsel/default.nix
View File

@ -2,17 +2,18 @@
# at https://www.x.org/releases/individual/. # at https://www.x.org/releases/individual/.
# That is why this expression is not inside pkgs.xorg # That is why this expression is not inside pkgs.xorg
{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}: { lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xfontsel-1.0.6"; pname = "xfontsel";
version = "1.0.6";
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/app/${name}.tar.bz2"; url = "mirror://xorg/individual/app/xfontsel-${version}.tar.bz2";
sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5";
}; };
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [libX11 libXaw]; buildInputs = [ libX11 libXaw ];
# Without this, it gets Xmu as a dependency, but without rpath entry # Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu"; NIX_LDFLAGS = "-lXmu";
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.x.org/"; homepage = "https://www.x.org/";
description = "Allows testing the fonts available in an X server"; description = "Allows testing the fonts available in an X server";
license = lib.licenses.free; license = lib.licenses.free;
maintainers = with lib.maintainers; [viric]; maintainers = with lib.maintainers; [ viric ];
platforms = with lib.platforms; linux ++ darwin; platforms = with lib.platforms; linux ++ darwin;
}; };
} }

7
pkgs/applications/misc/xpdf/libxpdf.nix
View File

@ -1,8 +1,11 @@
{ lib, stdenv, fetchurl { lib
, stdenv
, fetchurl
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libxpdf-3.02pl5"; pname = "libxpdf";
version = "3.02pl5";
src = fetchurl { src = fetchurl {
url = "https://dl.xpdfreader.com/old/xpdf-3.02.tar.gz"; url = "https://dl.xpdfreader.com/old/xpdf-3.02.tar.gz";

5
pkgs/applications/misc/xrq/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, libX11}: { lib, stdenv, fetchFromGitHub, libX11 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xrq-unstable-2016-01-15"; pname = "xrq";
version = "unstable-2016-01-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arianon"; owner = "arianon";

28
pkgs/applications/misc/xxkb/default.nix
View File

@ -1,21 +1,37 @@
{ lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep { lib
, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config , stdenv
, fetchurl
, libX11
, libXt
, libXext
, libXpm
, imake
, gccmakedep
, svgSupport ? false
, librsvg
, glib
, gdk-pixbuf
, pkg-config
}: }:
assert svgSupport -> assert svgSupport ->
librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xxkb-1.11.1"; pname = "xxkb";
version = "1.11.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xxkb/${name}-src.tar.gz"; url = "mirror://sourceforge/xxkb/xxkb-${version}-src.tar.gz";
sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf"; sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
}; };
nativeBuildInputs = [ imake gccmakedep ]; nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ buildInputs = [
libX11 libXt libXext libXpm libX11
libXt
libXext
libXpm
] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ];
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
version = "94.0"; version = "94.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "5eb65450a0f1842d28d73235f3ef95fa1dbf8cf1467c354f13df51313bd227aaf5a48b741ee49b13378aaaf054bff52004c1dd5a274eddef4a3cf1b913ef7071"; sha512 = "634665ed64f2ef205fad03ba023bc915df110c0d4b0a5e36aa470627808fbb3bce5418ea607f909d4e1eaf7d90c5dcacf398b8a434e26906dcfa366292a18b66";
}; };
meta = { meta = {

9
pkgs/applications/networking/cluster/helmfile/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm }: { lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "helmfile"; pname = "helmfile";
@ -15,17 +15,10 @@ buildGoModule rec {
doCheck = false; doCheck = false;
nativeBuildInputs = [ makeWrapper ];
subPackages = [ "." ]; subPackages = [ "." ];
ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ];
postInstall = ''
wrapProgram $out/bin/helmfile \
--prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
'';
meta = { meta = {
description = "Deploy Kubernetes Helm charts"; description = "Deploy Kubernetes Helm charts";
homepage = "https://github.com/roboll/helmfile"; homepage = "https://github.com/roboll/helmfile";

2
pkgs/applications/networking/instant-messengers/nheko/default.nix
View File

@ -18,7 +18,6 @@
, mtxclient , mtxclient
, boost17x , boost17x
, spdlog , spdlog
, fmt
, olm , olm
, pkg-config , pkg-config
, nlohmann_json , nlohmann_json
@ -52,7 +51,6 @@ mkDerivation rec {
libsecret libsecret
lmdb lmdb
spdlog spdlog
fmt
cmark cmark
qtbase qtbase
qtmultimedia qtmultimedia

13
pkgs/applications/networking/irc/tiny/default.nix
View File

@ -10,21 +10,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tiny"; pname = "tiny";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osa1"; owner = "osa1";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE="; sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1";
}; };
cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws="; cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1";
# Fix Cargo.lock version. Remove with the next release.
cargoPatches = [
./fix-Cargo.lock.patch
];
cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ]; cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ];
@ -34,7 +29,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "A console IRC client"; description = "A console IRC client";
homepage = "https://github.com/osa1/tiny"; homepage = "https://github.com/osa1/tiny";
changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/osa1/tiny/raw/v${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne vyp ]; maintainers = with maintainers; [ Br1ght0ne vyp ];
}; };

13
pkgs/applications/networking/irc/tiny/fix-Cargo.lock.patch
View File

@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 3a184dc..0e58cb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1023,7 +1023,7 @@ dependencies = [
[[package]]
name = "tiny"
-version = "0.8.0"
+version = "0.9.0"
dependencies = [
"clap",
"dirs 3.0.1",

4
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "notmuch"; pname = "notmuch";
version = "0.34"; version = "0.34.1";
src = fetchurl { src = fetchurl {
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
sha256 = "1dk16xa9q7adp1jaswxvw4p92f4h5mg0zkrh3zv8gqxn88amisc3"; sha256 = "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

10
pkgs/applications/office/antiword/default.nix
View File

@ -1,13 +1,11 @@
{ lib, fetchurl, stdenv }: { lib, fetchurl, stdenv }:
let stdenv.mkDerivation rec{
name = "antiword-0.37"; pname = "antiword";
in version = "0.37";
stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "http://www.winfield.demon.nl/linux/${name}.tar.gz"; url = "http://www.winfield.demon.nl/linux/antiword-${version}.tar.gz";
sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f";
}; };

3
pkgs/applications/office/beancount/bean-add.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, python3Packages }: { lib, stdenv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bean-add-2018-01-08"; pname = "bean-add";
version = "unstable-2018-01-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simon-v"; owner = "simon-v";

7
pkgs/applications/office/keepnote/default.nix
View File

@ -1,11 +1,12 @@
{ lib, fetchurl, python2Packages }: { lib, fetchurl, python2Packages }:
python2Packages.buildPythonApplication { python2Packages.buildPythonApplication rec {
name = "keepnote-0.7.8"; pname = "keepnote";
version = "0.7.8";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz"; url = "http://keepnote.org/download/keepnote-${version}.tar.gz";
sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
}; };

14
pkgs/applications/office/tagainijisho/default.nix
View File

@ -1,9 +1,11 @@
{ lib, stdenv, fetchurl, qt4, cmake, sqlite }: { lib, stdenv, fetchurl, qt4, cmake, sqlite }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "tagainijisho-1.0.3"; pname = "tagainijisho";
version = "1.0.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"; url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz";
sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg";
}; };
@ -14,8 +16,10 @@ stdenv.mkDerivation {
description = "A free, open-source Japanese dictionary and kanji lookup tool"; description = "A free, open-source Japanese dictionary and kanji lookup tool";
homepage = "https://www.tagaini.net/"; homepage = "https://www.tagaini.net/";
license = with licenses; [ license = with licenses; [
/* program */ gpl3Plus /* program */
/* data */ cc-by-sa-30 gpl3Plus
/* data */
cc-by-sa-30
]; ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ vbgl ]; maintainers = with maintainers; [ vbgl ];

3
pkgs/applications/radio/kalibrate-hackrf/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kalibrate-hackrf-unstable-20160827"; pname = "kalibrate-hackrf";
version = "unstable-2016-08-27";
# There are no tags/releases, so use the latest commit from git master. # There are no tags/releases, so use the latest commit from git master.
# Currently, the latest commit is from 2016-07-03. # Currently, the latest commit is from 2016-07-03.

3
pkgs/applications/radio/kalibrate-rtl/default.nix
View File

@ -1,7 +1,8 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: { lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kalibrate-rtl-20131214"; pname = "kalibrate-rtl";
version = "2013-12-14";
# There are no tags/releases, so use the latest commit from git master. # There are no tags/releases, so use the latest commit from git master.
# Currently, the latest commit is from 2013-12-14. # Currently, the latest commit is from 2013-12-14.

5
pkgs/applications/science/astronomy/gravit/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: { lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gravit-0.5.1"; pname = "gravit";
version = "0.5.1";
src = fetchurl { src = fetchurl {
url = "https://gravit.slowchop.com/media/downloads/${name}.tgz"; url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz";
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
}; };

15
pkgs/applications/science/biology/cmtk/default.nix
View File

@ -1,11 +1,12 @@
{lib, stdenv, fetchurl, cmake}: { lib, stdenv, fetchurl, cmake }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "cmtk-3.3.1"; pname = "cmtk";
version = "3.3.1";
src = fetchurl { src = fetchurl {
name = "cmtk-source.tar.gz"; name = "cmtk-source.tar.gz";
url = "https://www.nitrc.org/frs/download.php/8198/CMTK-3.3.1-Source.tar.gz//?i_agree=1&download_now=1"; url = "https://www.nitrc.org/frs/download.php/8198/CMTK-${version}-Source.tar.gz//?i_agree=1&download_now=1";
sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs"; sha256 = "1nmsga9m7vcc4y4a6zl53ra3mwlgjwdgsq1j291awkn7zr1az6qs";
}; };
@ -14,13 +15,13 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
meta = with lib; { meta = with lib; {
description = "Computational Morphometry Toolkit "; description = "Computational Morphometry Toolkit ";
longDescription = ''A software toolkit for computational morphometry of longDescription = ''A software toolkit for computational morphometry of
biomedical images, CMTK comprises a set of command line tools and a biomedical images, CMTK comprises a set of command line tools and a
back-end general-purpose library for processing and I/O''; back-end general-purpose library for processing and I/O'';
maintainers = with maintainers; [ tbenst ]; maintainers = with maintainers; [ tbenst ];
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl3; license = licenses.gpl3;
homepage = "https://www.nitrc.org/projects/cmtk/"; homepage = "https://www.nitrc.org/projects/cmtk/";
}; };
} }

9
pkgs/applications/science/biology/diamond/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, cmake, zlib }: { lib, stdenv, fetchurl, cmake, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "diamond-0.8.36"; pname = "diamond";
version = "0.8.36";
src = fetchurl { src = fetchurl {
url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz"; url = "https://github.com/bbuchfink/diamond/archive/v${version}.tar.gz";
sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh"; sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh";
}; };
@ -30,7 +31,7 @@ stdenv.mkDerivation {
B. Buchfink, Xie C., D. Huson, B. Buchfink, Xie C., D. Huson,
"Fast and sensitive protein alignment using DIAMOND", "Fast and sensitive protein alignment using DIAMOND",
Nature Methods 12, 59-60 (2015). Nature Methods 12, 59-60 (2015).
''; '';
homepage = "https://github.com/bbuchfink/diamond"; homepage = "https://github.com/bbuchfink/diamond";
license = { license = {
fullName = "University of Tuebingen, Benjamin Buchfink"; fullName = "University of Tuebingen, Benjamin Buchfink";

5
pkgs/applications/science/biology/ecopcr/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, gcc, zlib, python27 }: { lib, stdenv, fetchurl, gcc, zlib, python27 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ecopcr-0.8.0"; pname = "ecopcr";
version = "0.8.0";
src = fetchurl { src = fetchurl {
url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/${name}.tar.gz"; url = "https://git.metabarcoding.org/obitools/ecopcr/uploads/6f37991b325c8c171df7e79e6ae8d080/ecopcr-${version}.tar.gz";
sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6"; sha256 = "10c58hj25z78jh0g3zcbx4890yd2qrvaaanyx8mn9p49mmyf5pk6";
}; };

16
pkgs/applications/science/biology/emboss/default.nix
View File

@ -1,9 +1,11 @@
{lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: { lib, stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib }:
stdenv.mkDerivation rec {
pname = "emboss";
version = "6.6.0";
stdenv.mkDerivation {
name = "emboss-6.6.0";
src = fetchurl { src = fetchurl {
url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz"; url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${version}.tar.gz";
sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e";
}; };
@ -16,13 +18,13 @@ stdenv.mkDerivation {
''; '';
meta = { meta = {
description = "The European Molecular Biology Open Software Suite"; description = "The European Molecular Biology Open Software Suite";
longDescription = ''EMBOSS is a free Open Source software analysis package longDescription = ''EMBOSS is a free Open Source software analysis package
specially developed for the needs of the molecular biology (e.g. EMBnet) specially developed for the needs of the molecular biology (e.g. EMBnet)
user community, including libraries. The software automatically copes with user community, including libraries. The software automatically copes with
data in a variety of formats and even allows transparent retrieval of data in a variety of formats and even allows transparent retrieval of
sequence data from the web.''; sequence data from the web.'';
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
homepage = "http://emboss.sourceforge.net/"; homepage = "http://emboss.sourceforge.net/";
}; };
} }

71
pkgs/applications/science/biology/iv/default.nix
View File

@ -1,32 +1,43 @@
{ lib, stdenv, fetchurl, neuron-version { lib
, libX11, libXext, patchelf , stdenv
, fetchurl
, neuron-version
, libX11
, libXext
, patchelf
}: }:
stdenv.mkDerivation rec stdenv.mkDerivation rec {
{ name = "iv-19"; pname = "iv";
src = fetchurl version = "19";
{ url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz";
sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; src = fetchurl {
}; url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/iv-${version}.tar.gz";
nativeBuildInputs = [ patchelf ]; sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx";
buildInputs = [ libXext ]; };
propagatedBuildInputs = [ libX11 ];
hardeningDisable = [ "format" ]; nativeBuildInputs = [ patchelf ];
postInstall = '' buildInputs = [ libXext ];
for dir in $out/*; do # */ propagatedBuildInputs = [ libX11 ];
if [ -d $dir/lib ]; then
mv $dir/* $out # */ hardeningDisable = [ "format" ];
rmdir $dir
break postInstall = ''
fi for dir in $out/*; do # */
done if [ -d $dir/lib ]; then
'' + lib.optionalString stdenv.isLinux '' mv $dir/* $out # */
patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so rmdir $dir
''; break
meta = with lib; fi
{ description = "InterViews graphical library for Neuron"; done
license = licenses.bsd3; '' + lib.optionalString stdenv.isLinux ''
homepage = "http://www.neuron.yale.edu/neuron"; patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so
platforms = platforms.all; '';
};
} meta = with lib; {
description = "InterViews graphical library for Neuron";
license = licenses.bsd3;
homepage = "http://www.neuron.yale.edu/neuron";
platforms = platforms.all;
};
}

5
pkgs/applications/science/chemistry/avogadro/default.nix
View File

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: { lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "avogadro-1.1.1"; pname = "avogadro";
version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/avogadro/${name}.tar.bz2"; url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2";
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
}; };

Some files were not shown because too many files have changed in this diff Show More