diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-24 20:31:44 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-25 17:35:21 +0100 |
commit | 9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef (patch) | |
tree | 6e5795908883df8f42e0f4491091347ebf8667e4 | |
parent | 7b6454cbb959e001a1e421d6cc00a00994fb7518 (diff) |
Add version attribute where maintainers |= nckx
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
78 files changed, 309 insertions, 374 deletions
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 36988c980917..21d1d0ef4c67 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -7,9 +7,9 @@ assert alsaSupport -> alsaLib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -let version = "1.0.8"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "fmit-${version}"; + version = "1.0.8"; src = fetchFromGitHub { sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd"; @@ -37,7 +37,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - inherit version; description = "Free Musical Instrument Tuner"; longDescription = '' FMIT is a graphical utility for tuning musical instruments, with error diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 71dc88b9231e..8780c0133406 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -1,8 +1,9 @@ {stdenv, fetchurl, id3lib, groff, zlib}: -let version = "0.1.12"; in stdenv.mkDerivation rec { name = "id3v2-${version}"; + version = "0.1.12"; + src = fetchurl { url = "mirror://sourceforge/id3v2/${name}.tar.gz"; sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1"; @@ -19,7 +20,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 701bf6f82f44..6a013e8c604f 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libav, libkeyfinder }: -let version = "2015-09-13"; in stdenv.mkDerivation rec { name = "keyfinder-cli-${version}"; + version = "2015-09-13"; src = fetchFromGitHub { repo = "keyfinder-cli"; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - inherit version; inherit (src.meta) homepage; description = "Musical key detection for digital audio (command-line tool)"; longDescription = '' diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 74110c5924e3..ae1a8ea1edf4 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }: -let version = "2.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "keyfinder-${version}"; + version = "2.1"; src = fetchFromGitHub { sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn"; @@ -11,8 +11,22 @@ stdenv.mkDerivation { owner = "ibsh"; }; + buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ]; + + postPatch = '' + substituteInPlace is_KeyFinder.pro \ + --replace "keyfinder.0" "keyfinder" \ + --replace '$$[QT_INSTALL_PREFIX]' "$out" \ + --replace "-stdlib=libc++" "" + ''; + + configurePhase = '' + qmake + ''; + + enableParallelBuilding = true; + meta = with stdenv.lib; { - inherit version; description = "Musical key detection for digital audio (graphical UI)"; longDescription = '' KeyFinder is an open source key detection tool, for DJs interested in @@ -28,19 +42,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ]; - - postPatch = '' - substituteInPlace is_KeyFinder.pro \ - --replace "keyfinder.0" "keyfinder" \ - --replace '$$[QT_INSTALL_PREFIX]' "$out" \ - --replace "-stdlib=libc++" "" - ''; - - configurePhase = '' - qmake - ''; - - enableParallelBuilding = true; } diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a27027406e2c..dcb274513102 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -15,11 +15,10 @@ with stdenv.lib; let - version = "0.1.1"; - # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation { + neovimLibvterm = stdenv.mkDerivation rec { name = "neovim-libvterm-${version}"; + version = "2015-11-06"; src = fetchFromGitHub { sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9"; @@ -59,8 +58,9 @@ let ignoreCollisions = true; }; - neovim = stdenv.mkDerivation { + neovim = stdenv.mkDerivation rec { name = "neovim-${version}"; + version = "0.1.1"; src = fetchFromGitHub { sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60"; @@ -146,7 +146,10 @@ let in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation { name = "neovim-${version}-configured"; + inherit (neovim) version; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' mkdir -p $out/bin for item in ${neovim}/bin/*; do diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 072cc698e920..f54628e0b8de 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }: -let version = "7.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "apitrace-${version}"; + version = "7.1"; src = fetchFromGitHub { sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a"; @@ -20,7 +20,6 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; homepage = https://apitrace.github.io; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index a2b7fd77337b..5f8a8ac6b9ae 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool , libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }: -let version = "3.19.4"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; + version = "3.19.4"; src = fetchurl { sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83"; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Simple scanning utility"; longDescription = '' A really easy way to scan both documents and photos. You can crop out the diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 0f85bf58c55e..53bdbcd12740 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeDesktopItem, unzip, jre }: -let version = "0.2"; in stdenv.mkDerivation rec { name = "swingsane-${version}"; + version = "0.2"; src = fetchurl { sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni"; @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "Java GUI for SANE scanner servers (saned)"; longDescription = '' SwingSane is a powerful, cross platform, open source Java front-end for diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 749e1864fda9..e5e8f823d277 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pythonPackages }: -let version = "2.21"; in pythonPackages.buildPythonPackage rec { name = "rawdog-${version}"; + version = "2.21"; src = fetchurl { url = "http://offog.org/files/${name}.tar.gz"; @@ -14,7 +14,6 @@ pythonPackages.buildPythonPackage rec { namePrefix = ""; meta = with stdenv.lib; { - inherit version; homepage = "http://offog.org/code/rawdog/"; description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 40c165c2540c..fd349b320d28 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, cppcheck, libmrss }: -let version = "2.1"; in stdenv.mkDerivation rec { name = "rsstail-${version}"; + version = "2.1"; src = fetchFromGitHub { sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "Monitor RSS feeds for new entries"; longDescription = '' RSSTail is more or less an RSS reader: it monitors an RSS feed and if it diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index fdc27b63e9e3..ffebeb744cea 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,22 +1,14 @@ { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }: -let version = "4.0.5.0"; in stdenv.mkDerivation rec { name = "x2goclient-${version}"; + version = "4.0.5.0"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; sha256 = "18a2pszh0nq2ir64a1ah1mlzddn4qcd12b339bv30n0y1ir92bi4"; }; - meta = with stdenv.lib; { - description = "Graphical NoMachine NX3 remote desktop client"; - homepage = http://x2go.org/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; - }; - buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ]; nativeBuildInputs = [ makeWrapper ]; @@ -35,4 +27,12 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin"; ''; + + meta = with stdenv.lib; { + description = "Graphical NoMachine NX3 remote desktop client"; + homepage = http://x2go.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; |