From 36fca9480535c08220bdd7838bbd1dbf42661d3e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 26 Sep 2013 21:37:49 +0200 Subject: [PATCH] Fix some issues in my packages reported by nixpkgs-lint. Signed-off-by: Moritz Ulrich --- pkgs/applications/networking/dropbox-cli/default.nix | 5 +++-- pkgs/development/compilers/avra/default.nix | 7 ++++--- pkgs/development/interpreters/elixir/default.nix | 10 +++++----- .../development/tools/build-managers/rebar/default.nix | 2 +- pkgs/development/tools/misc/stm32flash/default.nix | 10 ++++------ pkgs/tools/misc/stow/default.nix | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 34fe6db8932b..194b7d92c403 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -1,7 +1,8 @@ { stdenv, coreutils, fetchurl, python, dropbox }: stdenv.mkDerivation { - name = "dropbox-cli"; + # 1.6.0 because it's the only version mentioned in the script + name = "dropbox-cli-1.6.0"; src = fetchurl { # Note: dropbox doesn't version this file. Annoying. @@ -29,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://dropbox.com; - description = "Command line client for the dropbox daemon."; + description = "Command line client for the dropbox daemon"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; # NOTE: Dropbox itself only works on linux, so this is ok. diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix index db9fafa42f10..706659194005 100644 --- a/pkgs/development/compilers/avra/default.nix +++ b/pkgs/development/compilers/avra/default.nix @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { automake -a ''; - meta = { + meta = with stdenv.lib; { description = "Assember for the Atmel AVR microcontroller family"; homepage = http://avra.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 3ac2368342da..9eba4275dd31 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { homepage = "http://elixir-lang.org/"; - description = "Elixir is a functional, meta-programming aware language built on top of the Erlang VM."; + description = "A functional, meta-programming aware language built on top of the Erlang VM"; longDescription = '' Elixir is a functional, meta-programming @@ -41,8 +41,8 @@ stdenv.mkDerivation { fault-tolerant applications with hot code upgrades.p ''; - platforms = stdenv.lib.platforms.linux; - - maintainers = [ stdenv.lib.maintainers.the-kenny ]; + license = licenses.epl10; + platforms = platforms.linux; + maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 68eacf8d2ea4..ac6951785416 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/rebar/rebar"; - description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases."; + description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' rebar is a self-contained Erlang script, so it's easy to diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 496288285c7b..6b99a5755e42 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -8,19 +8,17 @@ stdenv.mkDerivation { sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; }; - buildInputs = []; - installPhase = '' # Manually copy, make install copies to /usr/local/bin mkdir -pv $out/bin/ cp stm32flash $out/bin/ ''; - meta = { - description = "Open source flash program for the STM32 ARM processors using the ST bootloader."; + meta = with stdenv.lib; { + description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; homepage = https://code.google.com/p/stm32flash/; license = "GPLv2"; - platforms = stdenv.lib.platforms.all; # Should work on all platforms - maintainers = [ stdenv.lib.maintainers.the-kenny ]; + platforms = platforms.all; # Should work on all platforms + maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index e0d7985ae07c..58f30a021fa3 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "Stow is a tool for managing the installation of multiple software packages in the same run-time directory tree."; + description = "A tool for managing the installation of multiple software packages in the same run-time directory tree"; longDescription = '' GNU Stow is a symlink farm manager which takes distinct packages