Merge pull request #130472 from Stunkymonkey/inherit-version3

various: cleanup of "inherit version;"
This commit is contained in:
Sandro 2021-07-18 00:38:39 +02:00 committed by GitHub
commit b4176ae90a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 52 additions and 157 deletions

View file

@ -118,7 +118,6 @@ stdenv.mkDerivation rec {
CLASP_SRC_DONTTOUCH = "true";
meta = {
inherit version;
description = "A Common Lisp implementation based on LLVM with C++ integration";
license = lib.licenses.lgpl21Plus ;
maintainers = [lib.maintainers.raskin];

View file

@ -32,7 +32,6 @@ in stdenv.mkDerivation {
'';
meta = with lib; {
inherit version;
description = "The LLVM-based D Compiler";
homepage = "https://github.com/ldc-developers/ldc";
# from https://github.com/ldc-developers/ldc/blob/master/LICENSE

View file

@ -99,7 +99,6 @@ let
homepage = "https://github.com/ethereum/solidity";
license = licenses.gpl3;
maintainers = with maintainers; [ dbrock akru lionello sifmelcara ];
inherit version;
};
};
in

View file

@ -1,9 +1,8 @@
{ lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
let
version = "0.6.3";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libgme";
inherit version;
version = "0.6.3";
meta = with lib; {
description = "A collection of video game music chip emulators";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, cmake, boost, python2}:
let version = "1.8.2"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "avro-c++";
inherit version;
version = "1.8.2";
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }:
let
version = "1.10.2";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "avro-c";
inherit version;
version = "1.10.2";
src = fetchurl {
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";

View file

@ -1,17 +1,12 @@
{ lib, stdenv, fetchurl }:
let
version = "0.6";
sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "bearssl";
inherit version;
version = "0.6";
src = fetchurl {
url = "https://www.bearssl.org/bearssl-${version}.tar.gz";
inherit sha256;
sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7";
};
outputs = [ "bin" "lib" "dev" "out" ];

View file

@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
# Requested here: https://github.com/cddlib/cddlib/issues/25
doCheck = true;
meta = with lib; {
inherit version;
description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron";
license = licenses.gpl2Plus;
maintainers = teams.sage.members;

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, pcre }:
let version = "1.0.10"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "classads";
inherit version;
version = "1.0.10";
src = fetchurl {
url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
let
version = "2.12.2";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "clfft";
inherit version;
version = "2.12.2";
src = fetchFromGitHub {
owner = "clMathLibraries";
@ -29,6 +27,5 @@ in stdenv.mkDerivation {
homepage = "http://clmathlibraries.github.io/clFFT/";
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = with maintainers; [ chessai ];
inherit version;
};
}

View file

@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
];
doCheck = true;
meta = with lib; {
inherit version;
description = "Elliptic curve tools";
homepage = "https://github.com/JohnCremona/eclib";
license = licenses.gpl2Plus;

View file

@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with lib; {
inherit version;
description = "Finite Field Linear Algebra Subroutines";
license = licenses.lgpl21Plus;
maintainers = teams.sage.members;

View file

@ -2,13 +2,9 @@
, libXrandr, libGLU, libGL, libXft, libXfixes, xinput
, CoreServices }:
let
version = "1.6.57";
in
stdenv.mkDerivation rec {
pname = "fox";
inherit version;
version = "1.6.57";
src = fetchurl {
url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";

View file

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";
inherit version;
homepage = "http://openkinect.org";
license = with lib.licenses; [ gpl2 asl20 ];
maintainers = with lib.maintainers; [ bennofs ];

View file

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [autoconf automake libtool gmpxx];
meta = {
inherit version;
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
maintainers = [lib.maintainers.raskin];

View file

@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [autoconf automake libtool gmpxx];
meta = {
inherit version;
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
maintainers = [lib.maintainers.raskin];

View file

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
doCheck = false;
meta = {
inherit version;
description = "A C++ library for arithmetic and algebraic computations";
license = lib.licenses.cecill-b;
maintainers = [lib.maintainers.raskin];

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
let
version = "2.0.4";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "goocanvas";
inherit version;
version = "2.0.4";
outputs = [ "out" "dev" "devdoc" ];

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchFromGitHub }:
let
version = "2.9.4";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "http-parser";
inherit version;
version = "2.9.4";
src = fetchFromGitHub {
owner = "nodejs";

View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
"--with-cblas=-lblas"
];
meta = {
inherit version;
description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers";
license = lib.licenses.gpl2Plus;
maintainers = [lib.maintainers.raskin];

View file

@ -1,17 +1,14 @@
{ fetchurl, lib, stdenv, unzip, ant, javac, jvm }:
let
version = "1.7R2";
xbeans = fetchurl {
url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk";
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "rhino";
inherit version;
version = "1.7R2";
src = fetchurl {
url = "mirror://mozilla/js/rhino1_7R2.zip";

View file

@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
inherit version;
homepage = "https://github.com/open-source-parsers/jsoncpp";
description = "A C++ library for interacting with JSON";
maintainers = with maintainers; [ ttuegel cpages ];

View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "ANSI C routines for fast base64 encoding/decoding";
license = lib.licenses.publicDomain;
platforms = lib.platforms.unix;

View file

@ -18,6 +18,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.lgpl3;
maintainers = [ lib.maintainers.raskin ] ;
platforms = lib.platforms.unix;
inherit version;
};
}

View file

@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
description = "Portable, simple C-language 9P client and server libary";
maintainers = with lib.maintainers; [ kovirobi ];
license = lib.licenses.mit;
inherit version;
platforms = with lib.platforms; unix;
};
}

View file

@ -1,12 +1,9 @@
{ lib, stdenv, fetchurl, expat, curl, fftw }:
let
version = "0.9.3";
deb_patch = "5";
in
stdenv.mkDerivation rec {
pname = "libofa";
inherit version;
version = "0.9.3";
deb_patch = "5";
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, libsigcxx }:
let version = "0.4"; in
stdenv.mkDerivation rec {
pname = "libpar2";
inherit version;
version = "0.4";
src = fetchurl {
url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz";

View file

@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
platforms = with lib.platforms; linux;
maintainers = with lib.maintainers; [raskin];
license = lib.licenses.bsd3;
inherit version;
downloadPage = "http://www.creytiv.com/pub/";
updateWalker = true;
downloadURLRegexp = "/re-.*[.]tar[.].*";

View file

@ -1,12 +1,9 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
, glib, isocodes, gobject-introspection }:
let
version = "5.4";
in
stdenv.mkDerivation rec {
pname = "libxklavier";
inherit version;
version = "5.4";
src = fetchgit {
url = "git://anongit.freedesktop.org/git/libxklavier";

View file

@ -4,11 +4,9 @@
, enableStatic ? stdenv.hostPlatform.isStatic
}:
let
version = "1.16.1";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libxsmm";
inherit version;
version = "1.16.1";
src = fetchFromGitHub {
owner = "hfp";

View file

@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
inherit version;
description = "C++ library for exact, high-performance linear algebra";
license = licenses.lgpl21Plus;
maintainers = teams.sage.members;

View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
checkInputs = [ boost ];
meta = with lib; {
inherit version;
homepage = "https://gitlab.com/mdds/mdds";
description = "A collection of multi-dimensional data structure and indexing algorithm";
platforms = platforms.all;

View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
buildInputs = [ mpfr ];
meta = {
inherit version;
description = "A multiple precision interval arithmetic library based on MPFR";
homepage = "https://gforge.inria.fr/projects/mpfi/";
license = lib.licenses.lgpl21Plus;

View file

@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ "--enable-fat" ];
meta = {
inherit version;
description = "A highly optimised library for bignum arithmetic forked from GMP";
license = lib.licenses.lgpl3Plus;
maintainers = [lib.maintainers.raskin];

View file

@ -1,11 +1,9 @@
{ lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap
, pkg-config }:
let version = "3.4"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "ndpi";
inherit version;
version = "3.4";
src = fetchFromGitHub {
owner = "ntop";

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }:
let version = "6.0.0"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "nix-plugins";
inherit version;
version = "6.0.0";
src = fetchFromGitHub {
owner = "shlevy";

View file

@ -9,15 +9,12 @@ let
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
version = "3.53.1";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
pname = "nss";
inherit version;
version = "3.53.1";
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "05jk65x3zy6q8lx2djj8ik7kg741n88iy4n3bblw89cv0xkxxk1d";
};

View file

@ -1,12 +1,8 @@
{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }:
let
version = "016";
in
stdenv.mkDerivation rec {
pname = "ntrack";
inherit version;
version = "016";
src = fetchurl {
url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz";

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl }:
let
version = "0.1.5";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "opencore-amr";
inherit version;
version = "0.1.5";
src = fetchurl {
url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";

View file

@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ deepfire ];
platforms = platforms.linux; # PAM is not available on Darwin
inherit version;
};
}

View file

@ -13,6 +13,5 @@ stdenv.mkDerivation rec {
description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
maintainers = with lib.maintainers; [ raskin ];
platforms = lib.platforms.all;
inherit version;
};
}

View file

@ -2,12 +2,9 @@
, libtool, flex, libevent, hwloc, munge, zlib, pandoc
} :
let
version = "3.2.3";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "pmix";
inherit version;
version = "3.2.3";
src = fetchFromGitHub {
repo = "openpmix";

View file

@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
};
meta = {
inherit version;
description = "File open routines to safely open a file when in the presence of an attack";
license = lib.licenses.asl20 ;
maintainers = [lib.maintainers.raskin];

View file

@ -23,6 +23,5 @@ stdenv.mkDerivation rec {
license = licenses.cpl10;
maintainers = with maintainers; [ deepfire ];
platforms = platforms.unix;
inherit version;
};
}

View file

@ -7,12 +7,11 @@
}:
let
inherit (lib) optional;
version = "3.9.1";
in
stdenv.mkDerivation rec {
pname = "liblapack";
inherit version;
version = "3.9.1";
src = fetchFromGitHub {
owner = "Reference-LAPACK";
@ -57,7 +56,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "Linear Algebra PACKage";
homepage = "http://www.netlib.org/lapack/";
license = licenses.bsd3;

View file

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems";
license = lib.licenses.gpl2 ;
maintainers = [lib.maintainers.raskin];

View file

@ -3,13 +3,9 @@
, IOKit, Foundation, AppKit, OpenAL
}:
let
version = "2.5.1";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "sfml";
inherit version;
version = "2.5.1";
src = fetchzip {
url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";

View file

@ -1,11 +1,8 @@
{lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}:
let
version = "0.12";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libstartup-notification";
inherit version;
version = "0.12";
src = fetchurl {
url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";

View file

@ -72,7 +72,6 @@ stdenv.mkDerivation rec {
cp -r scenes "$out/share/tachyon/scenes"
'';
meta = {
inherit version;
description = "A Parallel / Multiprocessor Ray Tracing System";
license = lib.licenses.bsd3;
maintainers = [lib.maintainers.raskin];

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, perl }:
let
version = "2.1.0";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "uthash";
inherit version;
version = "2.1.0";
src = fetchurl {
url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";

View file

@ -4,11 +4,9 @@
, buildPackages
}:
let
version = "0.3.11";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "volume_key";
inherit version;
version = "0.3.11";
src = fetchgit {
url = "https://pagure.io/volume_key.git";

View file

@ -11,12 +11,9 @@ assert withMesa -> libGLU != null && libGL != null;
with lib;
let
version = "2.9.4";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "wxwidgets";
inherit version;
version = "2.9.4";
src = fetchurl {
url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";

View file

@ -4,12 +4,9 @@
, openssl, nss_3_53, lib, runCommandCC, writeText }:
lib.fix (self:
let
version = "1.2.31";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "xmlsec";
inherit version;
version = "1.2.31";
src = fetchurl {
url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";

View file

@ -28,7 +28,6 @@ buildRubyGem rec {
'';
meta = {
inherit version;
description = "Creates Nix packages from Gemfiles";
longDescription = ''
This is a tool that converts Gemfile.lock files to nix expressions.

View file

@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus ;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
inherit version;
};
}

View file

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://ck.kolivas.org/apps/lrzip/";
description = "The CK LRZIP compression program (LZMA + RZIP)";
license = lib.licenses.gpl2Plus;
inherit version;
platforms = lib.platforms.unix;
};
}

View file

@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "A parallel compressor/decompressor for xz format";
license = lib.licenses.bsd2;
maintainers = [lib.maintainers.raskin];

View file

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
description = "Sorts FAT partition table, for devices that don't do sorting of files";
maintainers = [ maintainers.kovirobi ];
license = licenses.gpl2;
inherit version;
platforms = platforms.linux;
};
}

View file

@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs";
updateWalker = true;
inherit version;
homepage = "https://sourceforge.net/projects/smbnetfs/";
};
}

View file

@ -21,7 +21,6 @@ buildGoPackage rec {
buildInputs = [ libusb1 libiconv ];
meta = with lib; {
inherit version;
description = "aws-vault like tool for Okta authentication";
license = licenses.mit;
maintainers = with maintainers; [imalsogreg Chili-Man];

View file

@ -22,7 +22,6 @@ buildGoPackage rec {
];
meta = with lib; {
inherit version;
inherit (src.meta) homepage;
description = "Get 1password access from iterm2";
license = licenses.mit;