various: cleanup of "inherit version;"

This commit is contained in:
Felix Buehler 2021-07-17 19:56:23 +02:00
parent a314be4b4d
commit 87316d778b
57 changed files with 134 additions and 247 deletions

View file

@ -1,14 +1,12 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
let version = "0.4.4"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "clooj";
inherit version;
version = "0.4.4";
jar = fetchurl {
# mirrored as original mediafire.com source does not work without user interaction
url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar";
url = "https://archive.org/download/clooj-${version}-standalone/clooj-${version}-standalone.jar";
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
};

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
let version = "5.0"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "eff";
inherit version;
version = "5.0";
src = fetchFromGitHub {
owner = "matijapretnar";

View file

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = [ maintainers.kovirobi ];
platforms = with platforms; linux ++ darwin;
inherit version;
mainProgram = "apl";
longDescription = ''

View file

@ -1,10 +1,8 @@
{ lib, fetchurl, python2Packages }:
let version = "0.9.5.1.1"; in
python2Packages.buildPythonPackage {
python2Packages.buildPythonPackage rec {
pname = "pyrex";
inherit version;
version = "0.9.5.1.1";
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{ lib, fetchurl, python2Packages }:
let version = "0.9.6.4"; in
python2Packages.buildPythonPackage {
python2Packages.buildPythonPackage rec {
pname = "pyrex";
inherit version;
version = "0.9.6.4";
src = fetchurl {
url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";

View file

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.unix;
license = lib.licenses.bsdOriginal;
maintainers = [ lib.maintainers.raskin ];
inherit version;
downloadPage = "https://github.com/sshock/AFFLIBv3/tags";
};
}

View file

@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
meta = with lib; {
inherit version;
description = "Utilities library for Linphone";
homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
license = licenses.gpl3Plus;

View file

@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "Cryptographic algorithms library";
maintainers = with maintainers; [ raskin ];
platforms = platforms.unix;

View file

@ -1,12 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake, sfml }:
let
version = "2.5";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "csfml";
inherit version;
version = "2.5";
src = fetchFromGitHub {
owner = "SFML";
repo = "CSFML";

View file

@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
inherit version;
description = "Fast Library for Number Theory";
license = lib.licenses.gpl2Plus;
maintainers = lib.teams.sage.members;

View file

@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
buildInputs = [gmp mpfr];
meta = {
inherit version;
description = "Lattice algorithms using floating-point arithmetic";
license = lib.licenses.lgpl21Plus;
maintainers = [lib.maintainers.raskin];

View file

@ -1,9 +1,8 @@
{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
let version = "3.2.1";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "freeglut";
inherit version;
version = "3.2.1";
src = fetchurl {
url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";

View file

@ -2,12 +2,9 @@
, blas, gfortran, openssh, mpi
} :
let
version = "5.8";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "globalarrays";
inherit version;
version = "5.8";
src = fetchFromGitHub {
owner = "GlobalArrays";

View file

@ -10,12 +10,9 @@ assert idnSupport -> libidn != null;
with lib;
let
version = "1.0.24";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec{
pname = "gloox";
inherit version;
version = "1.0.24";
src = fetchurl {
url = "https://camaya.net/download/gloox-${version}.tar.bz2";

View file

@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]);
meta = with lib; {
inherit version;
description = "Header-only C++ HDF5 interface";
license = licenses.boost;
homepage = "https://bluebrain.github.io/HighFive/";

View file

@ -3,13 +3,9 @@
, qtbase
}:
let
version = "1.10.0";
in
mkDerivation {
mkDerivation rec {
pname = "kdsoap";
inherit version;
version = "1.10.0";
meta = {
description = "A Qt-based client-side and server-side SOAP component";
longDescription = ''

View file

@ -1,6 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla
, libusb1, udev }:
let
# fetch submodule
noos = fetchFromGitHub {
@ -9,12 +8,9 @@ let
rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157";
sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c";
};
version = "2.2.1";
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
pname = "libbladeRF";
inherit version;
version = "2.2.1";
src = fetchFromGitHub {
owner = "Nuand";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }:
let version = "6.0.2"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libcec";
inherit version;
version = "6.0.2";
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, cmake }:
let version = "2.1.0.1"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "p8-platform";
inherit version;
version = "2.1.0.1";
src = fetchurl {
url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";

View file

@ -1,9 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
let version = "0.7.2"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libdynd";
inherit version;
version = "0.7.2";
src = fetchFromGitHub {
owner = "libdynd";

View file

@ -1,9 +1,8 @@
{ lib, stdenv, fetchurl, unzip }:
let
version = "7.6.1";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libjson";
inherit version;
version = "7.6.1";
src = fetchurl {
url = "mirror://sourceforge/libjson/libjson_${version}.zip";
sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, file }:
let
version = "0.8.9.0";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "libmodplug";
inherit version;
version = "0.8.9.0";
preConfigure = ''
substituteInPlace configure \

View file

@ -7,12 +7,9 @@
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
let
version = "1.2.1";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libmpc";
inherit version; # to avoid clash with the MPD client
version = "1.2.1"; # to avoid clash with the MPD client
src = fetchurl {
url = "mirror://gnu/mpc/mpc-${version}.tar.gz";

View file

@ -1,12 +1,9 @@
{ lib, stdenv, fetchurl
, fixedPoint ? false, withCustomModes ? true }:
let
version = "1.3.1";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libopus";
inherit version;
version = "1.3.1";
src = fetchurl {
url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, libopus }:
let
version = "0.2.1";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libopusenc";
inherit version;
version = "0.2.1";
src = fetchurl {
url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{lib, stdenv, fetchurl}:
let version = "1.6.2"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libossp-uuid";
inherit version;
version = "1.6.2";
src = fetchurl {
url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz";

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl }:
let version = "1.8.5"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libspatialindex";
inherit version;
version = "1.8.5";
src = fetchurl {
url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz";

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }:
let
version = "5.1.5";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "libxc";
inherit version;
version = "5.1.5";
src = fetchFromGitLab {
owner = "libxc";

View file

@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-werror" ];
meta = {
inherit version;
description = "A library that parses the file format of Zoner Callisto/Draw documents";
license = lib.licenses.mpl20;
maintainers = [lib.maintainers.raskin];

View file

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
inherit version;
description = "Compute the perceptual hash of an image";
license = licenses.gpl3;
maintainers = [maintainers.imalsogreg];

View file

@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [raskin];
license = lib.licenses.gpl2;
downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
inherit version;
updateWalker = true;
};
}

View file

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

View file

@ -1,10 +1,8 @@
{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
let version = "1.9.16"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "ant";
inherit version;
version = "1.9.16";
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,10 +1,8 @@
{ fetchurl, lib, stdenv, coreutils, makeWrapper }:
let version = "1.10.11"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "ant";
inherit version;
version = "1.10.11";
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,12 +2,9 @@
assert guileSupport -> ( pkg-config != null && guile != null );
let
version = "4.2.1";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "gnumake";
inherit version;
version = "4.2.1";
src = fetchurl {
url = "mirror://gnu/make/make-${version}.tar.bz2";

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, guileSupport ? false, pkg-config, guile }:
let
version = "4.3";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "gnumake";
inherit version;
version = "4.3";
src = fetchurl {
url = "mirror://gnu/make/make-${version}.tar.gz";

View file

@ -1,12 +1,8 @@
{ lib, stdenv, fetchurl, erlang }:
let
version = "2.6.4";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "rebar";
inherit version;
version = "2.6.4";
src = fetchurl {
url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";

View file

@ -1,8 +1,7 @@
{ lib, fetchFromGitHub, buildGoModule }:
let version = "1.3.0";
in buildGoModule rec {
inherit version;
buildGoModule rec {
version = "1.3.0";
pname = "drone-cli";
revision = "v${version}";

View file

@ -4,11 +4,9 @@
, jre
, drivers ? []
}:
let
version = "4.1.0";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "squirrel-sql";
inherit version;
version = "4.1.0";
src = fetchurl {
url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip";

View file

@ -1,10 +1,7 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
let
version = "7.5.4";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec{
pname = "flyway";
inherit version;
version = "7.5.4";
src = fetchurl {
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I=";
@ -36,4 +33,4 @@
platforms = platforms.unix;
maintainers = [ maintainers.cmcdragonkai ];
};
}
}

View file

@ -1,9 +1,8 @@
{ fetchurl, lib, stdenv, zlib }:
let version = "0.98"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "fastjar";
inherit version;
version = "0.98";
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz";
@ -29,4 +28,4 @@ let version = "0.98"; in
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
}

View file

@ -66,6 +66,5 @@ stdenv.mkDerivation rec {
platforms = with platforms; linux ++ darwin;
downloadPage = "http://stedolan.github.io/jq/download/";
updateWalker = true;
inherit version;
};
}

View file

@ -1,10 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
let
version = "2.5.5";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "minizinc";
inherit version;
version = "2.5.5";
nativeBuildInputs = [ cmake flex bison ];

View file

@ -1,10 +1,7 @@
{ lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
let
version = "2.5.3";
in
mkDerivation {
mkDerivation rec {
pname = "minizinc-ide";
inherit version;
version = "2.5.3";
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine qtwebkit ];

View file

@ -1,10 +1,7 @@
{ lib, stdenv, fetchurl, libusb-compat-0_1 }:
let
version = "0.7.2";
in
stdenv.mkDerivation rec {
pname = "dfu-programmer";
inherit version;
version = "0.7.2";
buildInputs = [ libusb-compat-0_1 ];

View file

@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "A package manager for Lua";
license = licenses.mit ;
maintainers = with maintainers; [raskin teto];

View file

@ -1,9 +1,8 @@
{ lib, pythonPackages, fetchFromGitHub }:
let version = "0.1.2"; in
pythonPackages.buildPythonApplication {
pythonPackages.buildPythonApplication rec {
pname = "nixbang";
inherit version;
version = "0.1.2";
namePrefix = "";
src = fetchFromGitHub {

View file

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, libelf }:
let
version = "20130503";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "prelink";
inherit version;
version = "20130503";
buildInputs = [
libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc)

View file

@ -1,10 +1,8 @@
{ lib, stdenv, fetchzip, ocaml }:
let version = "0.1.10"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "obuild";
inherit version;
version = "0.1.10";
src = fetchzip {
url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz";

View file

@ -1,10 +1,7 @@
{ lib, stdenv, fetchFromGitHub, ocaml, findlib }:
let
version = "0.14.0";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "ocamlbuild-${version}";
inherit version;
version = "0.14.0";
src = fetchFromGitHub {
owner = "ocaml";

View file

@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "A parser generator like bison, but it generates C++ code";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin ];

View file

@ -1,12 +1,9 @@
{ lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }:
let
# Update spirv-headers rev in lockstep according to DEPs file
version = "2020.2";
in
stdenv.mkDerivation rec {
pname = "spirv-tools";
inherit version;
# Update spirv-headers rev in lockstep according to DEPs file
version = "2020.2";
src = fetchFromGitHub {
owner = "KhronosGroup";

View file

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
inherit (src.homepage);
description = "A FUSE-based filesystem that uses the p7zip library";
longDescription = ''

View file

@ -1,9 +1,8 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, file, fuse, libmtp }:
let version = "0.5"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "jmtpfs";
inherit version;
version = "0.5";
src = fetchFromGitHub {
sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1";

View file

@ -1,9 +1,8 @@
{lib, stdenv, fetchurl, libaal}:
let version = "2.0.4"; in
stdenv.mkDerivation rec {
pname = "reiser4progs";
inherit version;
version = "2.0.4";
src = fetchurl {
url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz";

View file

@ -1,9 +1,8 @@
{ lib, stdenv, fetchurl, libuuid, autoreconfHook }:
let version = "3.6.24"; in
stdenv.mkDerivation rec {
pname = "reiserfsprogs";
inherit version;
version = "3.6.24";
src = fetchurl {
url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz";

View file

@ -1,9 +1,8 @@
{ lib, stdenv, fetchFromGitHub, ruby, zfs }:
let version = "0.3.6"; in
stdenv.mkDerivation rec {
pname = "zfstools";
inherit version;
version = "0.3.6";
src = fetchFromGitHub {
sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg";