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

More version attribute tidying where maintainers |= nckx

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-25 20:08:34 +01:00
parent 9fb8020e4e
commit ac33b4724a
23 changed files with 43 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/audio/dfasma/default.nix
View File

@ -2,10 +2,6 @@
let
version = "1.2.5";
rev = "v${version}";
sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
reaperFork = {
src = fetchFromGitHub {
sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
@ -30,11 +26,13 @@ let
};
};
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
name = "dfasma-${version}";
version = "1.2.5";
src = fetchFromGitHub {
inherit sha256 rev;
sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
rev = "v${version}";
repo = "dfasma";
owner = "gillesdegottex";
};
@ -60,7 +58,6 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Analyse and compare audio files in time and frequency";
longDescription = ''
DFasma is free open-source software to compare audio files by time and

4
pkgs/applications/graphics/sane/backends/generic.nix
View File

@ -13,7 +13,7 @@
}:
stdenv.mkDerivation {
inherit src;
inherit src version;
name = "sane-backends-${version}";
@ -56,8 +56,6 @@ stdenv.mkDerivation {
'' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
meta = with stdenv.lib; {
inherit version;
description = "SANE (Scanner Access Now Easy) backends";
longDescription = ''
Collection of open-source SANE backends (device drivers).

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

@ -2,11 +2,11 @@
let
getmodel = name: sha256: {
inherit name;
src = fetchurl {
url = "http://www.tmbdev.net/ocropy/${name}";
inherit sha256;
};
inherit name;
};
models = [
@ -16,10 +16,10 @@ let
"1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b")
];
version = "20150316";
in
pythonPackages.buildPythonPackage {
pythonPackages.buildPythonPackage rec {
name = "ocropus-${version}";
version = "20150316";
src = fetchFromGitHub {
sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g";
@ -49,7 +49,6 @@ pythonPackages.buildPythonPackage {
'';
meta = with stdenv.lib; {
inherit version;
description = "Open source document analysis and OCR system";
license = licenses.asl20;
homepage = https://github.com/tmbdev/ocropy/;

6
pkgs/applications/misc/redshift/default.nix
View File

@ -7,13 +7,14 @@
}:
let
version = "1.11";
mkFlag = flag: name: if flag
then "--enable-${name}"
else "--disable-${name}";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "redshift-${version}";
version = "1.11";
src = fetchurl {
sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh";
url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
@ -51,7 +52,6 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Gradually change screen color temperature";
longDescription = ''
The color temperature is set according to the position of the

8
pkgs/data/misc/geolite-legacy/default.nix
View File

@ -5,13 +5,10 @@ let
inherit name sha256;
url = "https://geolite.maxmind.com/download/geoip/database/${src}";
};
# Annoyingly, these files are updated without a change in URL. This means that
# builds will start failing every month or so, until the hashes are updated.
version = "2016-01-25";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "geolite-legacy-${version}";
version = "2016-01-25";
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@ -33,7 +30,6 @@ stdenv.mkDerivation {
"1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56";
meta = with stdenv.lib; {
inherit version;
description = "GeoLite Legacy IP geolocation databases";
homepage = https://geolite.maxmind.com/download/geoip;
license = licenses.cc-by-sa-30;

6
pkgs/development/libraries/cpp-netlib/default.nix
View File

@ -1,11 +1,8 @@
{ stdenv, fetchurl, cmake, boost, openssl }:
let
version = "0.11.2";
in
stdenv.mkDerivation rec {
name = "cpp-netlib-${version}";
version = "0.11.2";
src = fetchurl {
url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2";
@ -19,7 +16,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit version;
description = "A collection of open-source libraries for high level network programming";
homepage = http://cpp-netlib.org;
license = licenses.boost;

6
pkgs/development/libraries/libpsl/default.nix
View File

@ -3,8 +3,6 @@
let
version = "${libVersion}-list-${listVersion}";
listVersion = "2016-01-15";
listSources = fetchFromGitHub {
sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5";
@ -15,8 +13,9 @@ let
libVersion = "0.12.0";
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
name = "libpsl-${version}";
version = "${libVersion}-list-${listVersion}";
src = fetchFromGitHub {
sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw";
@ -54,7 +53,6 @@ in stdenv.mkDerivation {
doCheck = true;
meta = with stdenv.lib; {
inherit version;
description = "C library for the Publix Suffix List";
longDescription = ''
libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"

1
pkgs/development/tools/build-managers/icmake/default.nix
View File

@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
inherit version;
description = "A program maintenance (make) utility using a C-like grammar";
homepage = https://fbb-git.github.io/icmake/;
license = licenses.gpl3;

12
pkgs/development/tools/misc/ccache/default.nix
View File

@ -1,15 +1,11 @@
{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }:
let
let ccache = stdenv.mkDerivation rec {
name = "ccache-${version}";
version = "3.2.4";
sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
ccache =
stdenv.mkDerivation {
inherit name;
src = fetchurl {
inherit sha256;
sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
url = "mirror://samba/ccache/${name}.tar.xz";
};
@ -65,7 +61,6 @@ stdenv.mkDerivation {
};
meta = with stdenv.lib; {
inherit version;
description = "Compiler cache for fast recompilation of C/C++ code";
homepage = http://ccache.samba.org/;
downloadPage = https://ccache.samba.org/download.html;
@ -73,5 +68,4 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ nckx ];
};
};
in
ccache
in ccache

6
pkgs/development/tools/parsing/lemon/default.nix
View File

@ -2,8 +2,6 @@
let
version = "1.0";
srcs = {
lemon = fetchurl {
sha256 = "1grm95m2cnc61zim332g7z8nchmcy91ljf50k13lm421v0ygyyv6";
@ -17,8 +15,9 @@ let
};
};
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
name = "lemon-${version}";
version = "1.0";
phases = [ "buildPhase" "installPhase" ];
@ -32,7 +31,6 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "An LALR(1) parser generator";
longDescription = ''
The Lemon program is an LALR(1) parser generator that takes a

3
pkgs/games/eduke32/default.nix
View File

@ -4,9 +4,9 @@
let
date = "20150420";
rev = "5160";
version = "${date}-${rev}";
in stdenv.mkDerivation rec {
name = "eduke32-${version}";
version = "${date}-${rev}";
src = fetchurl {
url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}/eduke32_src_${version}.tar.xz";
@ -66,7 +66,6 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
inherit version;
description = "Enhanched port of Duke Nukem 3D for various platforms";
license = licenses.gpl2Plus;
homepage = http://eduke32.com;

6
pkgs/misc/drivers/hplip/3.15.9.nix
View File

@ -8,9 +8,8 @@
let
version = "3.15.9";
name = "hplip-${version}";
version = "3.15.9";
src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz";
@ -48,7 +47,7 @@ assert withPlugin -> builtins.elem hplipArch pluginArches
|| throw "HPLIP plugin not supported on ${stdenv.system}";
stdenv.mkDerivation {
inherit name src;
inherit name src version;
buildInputs = [
libjpeg
@ -179,7 +178,6 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Print, scan and fax HP drivers for Linux";
homepage = http://hplipopensource.com/;
license = if withPlugin

4
pkgs/misc/drivers/hplip/default.nix
View File

@ -8,9 +8,8 @@
let
version = "3.15.11";
name = "hplip-${version}";
version = "3.15.11";
src = fetchurl {
url = "mirror://sourceforge/hplip/${name}.tar.gz";
@ -179,7 +178,6 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Print, scan and fax HP drivers for Linux";
homepage = http://hplipopensource.com/;
license = if withPlugin

5
pkgs/os-specific/linux/jfbview/default.nix
View File

@ -2,11 +2,11 @@
, mujs, mupdf, ncurses, openjpeg, openssl }:
let
version = "0.5.1";
binaries = [ "jfbpdf" "jfbview" "jpdfcat" "jpdfgrep" ];
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "jfbview-${version}";
version = "0.5.1";
src = fetchFromGitHub {
sha256 = "113bkf49q04k9rjps5l28ychmzsfjajp9cjhr433s9ld0972z01m";
@ -27,7 +27,6 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "PDF and image viewer for the Linux framebuffer";
longDescription = ''
A very fast PDF and image viewer for the Linux framebuffer with some

7
pkgs/os-specific/linux/phc-intel/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel, which }:
assert stdenv.isLinux;
# Don't bother with older versions, though some would probably work:
# Don't bother with older versions, though some might even work:
assert stdenv.lib.versionAtLeast kernel.version "4.3";
# Disable on grsecurity kernels, which break module building:
assert !kernel.features ? grsecurity;
@ -9,9 +9,9 @@ assert !kernel.features ? grsecurity;
let
release = "0.4.0";
revbump = "rev19"; # don't forget to change forum download id...
version = "${release}-${revbump}";
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
name = "linux-phc-intel-${version}-${kernel.version}";
version = "${release}-${revbump}";
src = fetchurl {
sha256 = "1apvjp2rpaf3acjvsxgk6xiwrx4n9p565gxvra05pvicwikfiqa8";
@ -38,7 +38,6 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Undervolting kernel driver for Intel processors";
longDescription = ''
PHC is a Linux kernel patch to undervolt processors. This can divide the

7
pkgs/servers/p910nd/default.nix
View File

@ -1,10 +1,8 @@
{ stdenv, fetchurl }:
let
version = "0.97";
stdenv.mkDerivation rec {
name = "p910nd-${version}";
in stdenv.mkDerivation {
inherit name;
version = "0.97";
src = fetchurl {
sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa";
@ -27,7 +25,6 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Small printer daemon passing jobs directly to the printer";
longDescription = ''
p910nd is a small printer daemon intended for diskless platforms that

5
pkgs/tools/compression/xdelta/default.nix
View File

@ -5,12 +5,12 @@
assert lzmaSupport -> xz != null;
let
version = "3.0.11";
mkWith = flag: name: if flag
then "--with-${name}"
else "--without-${name}";
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
name = "xdelta-${version}";
version = "3.0.11";
src = fetchFromGitHub {
sha256 = "1c7xym7xr26phyf4wb9hh2w88ybzbzh2w3h1kyqq3da0ndidmf2r";
@ -48,7 +48,6 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Binary differential compression in VCDIFF (RFC 3284) format";
longDescription = ''
xdelta is a command line program for delta encoding, which generates two

5
pkgs/tools/compression/xdelta/unstable.nix
View File

@ -5,12 +5,12 @@
assert lzmaSupport -> xz != null;
let
version = "3.1.0";
mkWith = flag: name: if flag
then "--with-${name}"
else "--without-${name}";
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
name = "xdelta-${version}";
version = "3.1.0";
src = fetchFromGitHub {
sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
@ -52,7 +52,6 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "Binary differential compression in VCDIFF (RFC 3284) format";
longDescription = ''
xdelta is a command line program for delta encoding, which generates two

5
pkgs/tools/filesystems/boxfs/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, curl, fuse, libxml2, pkgconfig }:
let
version = "2-20150109";
srcs = {
boxfs2 = fetchFromGitHub {
sha256 = "10af1l3sjnh25shmq5gdnpyqk4vrq7i1zklv4csf1n2nrahln8j8";
@ -22,8 +21,9 @@ let
owner = "vincenthz";
};
};
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
name = "boxfs-${version}";
version = "2-20150109";
src = srcs.boxfs2;
@ -45,7 +45,6 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
inherit version;
description = "FUSE file system for box.com accounts";
longDescription = ''
Store files on box.com (an account is required). The first time you run

2
pkgs/tools/networking/httping/default.nix
View File

@ -3,7 +3,6 @@
stdenv.mkDerivation rec {
name = "httping-${version}";
version = "2.4";
src = fetchurl {
@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
inherit version;
homepage = http://www.vanheusden.com/httping;
description = "ping with HTTP requests";
longDescription = ''

7
pkgs/tools/networking/minissdpd/default.nix
View File

@ -1,10 +1,8 @@
{ stdenv, fetchurl, libnfnetlink }:
let
version = "1.5.20160119";
stdenv.mkDerivation rec {
name = "minissdpd-${version}";
in stdenv.mkDerivation {
inherit name;
version = "1.5.20160119";
src = fetchurl {
sha256 = "0z0h2fqjlys9g08fbv0jg8l53h8cjlpdk45z4g71kwdk1m9ld8r2";
@ -21,7 +19,6 @@ in stdenv.mkDerivation {
doCheck = true;
meta = with stdenv.lib; {
inherit version;
description = "Small daemon to speed up UPnP device discoveries";
longDescription = ''
MiniSSDPd receives NOTIFY packets and stores (caches) that information

3
pkgs/tools/security/sshuttle/default.nix
View File

@ -2,8 +2,8 @@
, coreutils, iptables, nettools, openssh, procps }:
pythonPackages.buildPythonPackage rec {
version = "0.76";
name = "sshuttle-${version}";
version = "0.76";
src = fetchurl {
sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b";
@ -26,7 +26,6 @@ pythonPackages.buildPythonPackage rec {
'';
meta = with stdenv.lib; {
inherit version;
homepage = https://github.com/sshuttle/sshuttle/;
description = "Transparent proxy server that works as a poor man's VPN";
longDescription = ''

7
pkgs/tools/system/stress-ng/default.nix
View File

@ -1,10 +1,8 @@
{ stdenv, fetchurl, attr, keyutils }:
let
version = "0.05.00";
stdenv.mkDerivation rec {
name = "stress-ng-${version}";
in stdenv.mkDerivation {
inherit name;
version = "0.05.00";
src = fetchurl {
sha256 = "0ppri86z6fj48nm5l0x1r8mh7mwaf7bvhmi10jz6a8w7apnc181w";
@ -22,7 +20,6 @@ in stdenv.mkDerivation {
installFlags = [ "DESTDIR=$(out)" ];
meta = with stdenv.lib; {
inherit version;
description = "Stress test a computer system";
longDescription = ''
Stress test a system in various selectable ways, exercising both various