Merge pull request #130196 from Stunkymonkey/inherit-version

This commit is contained in:
Sandro 2021-07-17 20:41:50 +02:00 committed by GitHub
commit f64bb073ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
56 changed files with 127 additions and 232 deletions

View File

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, automake, autoconf }:
let
version = "2.0.0";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "avr-libc";
inherit version;
version = "2.0.0";
src = fetchurl {
url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2";

View File

@ -9,14 +9,10 @@
"OMNINXT" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk?
]}:
let
version = "3.4.0-rc4";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "betaflight";
inherit version;
version = "3.4.0-rc4";
src = fetchFromGitHub {
owner = "betaflight";

View File

@ -2,14 +2,10 @@
, gcc-arm-embedded, binutils-arm-embedded, ruby
}:
let
version = "2.0.0-rc2";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "inav";
inherit version;
version = "2.0.0-rc2";
src = fetchFromGitHub {
owner = "iNavFlight";

View File

@ -1,11 +1,8 @@
{ lib, stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, util-linux }:
let
version = "0.6";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "abootimg";
inherit version;
version = "0.6";
src = fetchFromGitHub {
owner = "ggrandou";

View File

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

View File

@ -1,12 +1,9 @@
{ lib, stdenv, fetchurl, readline, bison }:
let
version = "0.9.1";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "es";
inherit version;
version = "0.9.1";
src = fetchurl {
url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz";

View File

@ -1,23 +1,19 @@
{ lib, stdenv, fetchurl, ncurses, pcre, buildPackages }:
let
version = "5.8";
documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv";
};
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "zsh";
inherit version;
version = "5.8";
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
};
documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv";
};
buildInputs = [ ncurses pcre ];
configureFlags = [

View File

@ -1,12 +1,8 @@
{ lib, stdenv, fetchFromGitHub }:
let
version = "0.4.4";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "nix-zsh-completions";
inherit version;
version = "0.4.4";
src = fetchFromGitHub {
owner = "spwhitt";

View File

@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
homepage = "https://www.nongnu.org/autocutsel/";
description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
license = lib.licenses.gpl2Plus;

View File

@ -33,8 +33,6 @@
}:
let
version = "3.2.1";
nvidia_x11s = [ nvidia_x11 ]
++ lib.optional nvidia_x11.useGLVND libglvnd
++ lib.optionals (nvidia_x11_i686 != null)
@ -57,7 +55,7 @@ let
in stdenv.mkDerivation rec {
pname = "bumblebee";
inherit version;
version = "3.2.1";
src = fetchurl {
url = "https://bumblebee-project.org/${pname}-${version}.tar.gz";

View File

@ -1,10 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, glib, gtkmm2 }:
let version = "1.6.1";
in
stdenv.mkDerivation rec {
pname = "nitrogen";
inherit version;
version = "1.6.1";
src = fetchurl {
url = "http://projects.l3ib.org/nitrogen/files/${pname}-${version}.tar.gz";

View File

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
sed -e "s@/etc/xdg@$out&@" -i Makefile
'';
meta = {
inherit version;
description = "Expose-style compositing-based standalone window switcher";
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];

View File

@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
'';
meta = {
inherit version;
description = "A gesture control for X11";
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];

View File

@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 ];
meta = {
inherit version;
description = "A tool to scribble over X windows";
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];

View File

@ -1,9 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, libpng, libX11, libXext, libXi, libXtst }:
let version = "1.09"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "xautomation";
inherit version;
version = "1.09";
src = fetchurl {
url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz";
sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf";

View File

@ -1,9 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, libX11, guile }:
let version = "1.8.7"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "xbindkeys";
inherit version;
version = "1.8.7";
src = fetchurl {
url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2";

View File

@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2 libXdamage ];
meta = {
inherit version;
description = "X window switcher drawing a colourful grid";
license = lib.licenses.bsd2 ;
maintainers = [lib.maintainers.raskin];

View File

@ -1,11 +1,8 @@
{ lib, stdenv, fetchbzr, xlibsWrapper }:
let
version = "4";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "xwinwrap";
inherit version;
version = "4";
src = fetchbzr {
url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel";

View File

@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
installTargets = [ "install" "install.man" ];
meta = {
inherit version;
description = "An X11 screen zoom tool";
license = lib.licenses.free ;
maintainers = [lib.maintainers.raskin];

View File

@ -4,13 +4,10 @@
, lib
}:
let
version = "release-2019-10-13";
in buildGoPackage {
buildGoPackage rec{
pname = "boulder";
inherit version;
version = "release-2019-10-13";
goPackagePath = "github.com/letsencrypt/boulder";

View File

@ -1,11 +1,8 @@
{ lib, stdenv, fetchurl, libdvdread, pkg-config }:
let
version = "0.17";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "lsdvd";
inherit version;
version = "0.17";
src = fetchurl {
url = "mirror://sourceforge/lsdvd/lsdvd-${version}.tar.gz";
sha256 = "1274d54jgca1prx106iyir7200aflr70bnb1kawndlmcckcmnb3x";

View File

@ -1,12 +1,10 @@
{ stdenv, fetchzip, jam, unzip, libX11, libXxf86vm, libXrandr, libXinerama
, libXrender, libXext, libtiff, libjpeg, libpng, libXScrnSaver, writeText
, libXdmcp, libXau, lib, openssl }:
let
version = "2.1.2";
in
stdenv.mkDerivation rec {
pname = "argyllcms";
inherit version;
version = "2.1.2";
src = fetchzip {
# Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a

View File

@ -2,17 +2,12 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
let
version = "0.9";
sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "briss";
inherit version;
version = "0.9";
src = fetchurl {
url = "mirror://sourceforge/briss/briss-${version}.tar.gz";
inherit sha256;
sha256 = "45dd668a9ceb9cd59529a9fefe422a002ee1554a61be07e6fc8b3baf33d733d9";
};
nativeBuildInputs = [makeWrapper];

View File

@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
'';
buildInputs = [mono];
meta = {
inherit version;
description = "Bitmap generation from a single example with convolutions and MCMC";
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];

View File

@ -11,12 +11,9 @@
, zlib
}:
let
version = "0.20";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "mscgen";
inherit version;
version = "0.20";
src = fetchurl {
url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";

View File

@ -1,13 +1,9 @@
{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:
with lib;
let
version = "6.14.12";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "pgf";
inherit version;
version = "6.14.12";
src = fetchurl {
url = "mirror://sourceforge/libpgf/pgf-console-src-${version}.tar.gz";

View File

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
'';
buildInputs = [mono];
meta = {
inherit version;
description = "Texture synthesis from examples";
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];

View File

@ -1,11 +1,9 @@
{ lib, stdenv, fetchFromGitHub
, libGL, libGLU, freeglut, libX11 }:
let
version = "2018-04-19";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "twilight";
inherit version;
version = "unstable-2018-04-19";
src = fetchFromGitHub {
owner = "tweakoz";

View File

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
'';
buildInputs = [mono];
meta = {
inherit version;
description = "A generator of bitmaps that are locally similar to the input bitmap";
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];

View File

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
cd "$out/lib/java"; for i in *.jar; do mv "$i" "''${i#*-}"; done
'';
meta = {
inherit version;
description = "1D and 2D code reading library";
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];

View File

@ -4,15 +4,11 @@
, systemd
, xrandr }:
let
python = python3Packages.python;
version = "1.11";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "autorandr";
inherit version;
version = "1.11";
buildInputs = [ python ];
buildInputs = [ python3Packages.python ];
# no wrapper, as autorandr --batch does os.environ.clear()
buildPhase = ''
@ -63,4 +59,4 @@ in
maintainers = with maintainers; [ coroa globin ];
platforms = platforms.unix;
};
}
}

View File

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
};
meta = with lib; {
inherit version;
description = "A fork of CUnit test framework";
homepage = "https://gitlab.linphone.org/BC/public/bcunit";
license = licenses.lgpl2Plus;

View File

@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "Interactive stack-based calculator";
homepage = "https://github.com/soveran/clac";
license = licenses.bsd2;

View File

@ -1,12 +1,8 @@
{ lib, stdenv, fetchurl }:
let
version = "3.1.4";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "clasp";
inherit version;
version = "3.1.4";
src = fetchurl {
url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz";

View File

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

View File

@ -1,8 +1,8 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, ncurses, CoreServices }:
let version = "0.2.7"; in
rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage rec {
pname = "dijo";
inherit version;
version = "0.2.7";
buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin CoreServices;
src = fetchFromGitHub {
owner = "NerdyPepper";

View File

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
description = "Scan HDD/SSD for failed and near failed sectors";
platforms = with platforms; linux;
maintainers = with maintainers; [ peterhoeg ];
inherit version;
license = licenses.gpl3;
};
}

View File

@ -1,9 +1,8 @@
{ lib, stdenv, fetchgit }:
let
version = "2018-12-06";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "edid-decode-unstable";
inherit version;
version = "unstable-2018-12-06";
src = fetchgit {
url = "git://linuxtv.org/edid-decode.git";

View File

@ -6,11 +6,10 @@
, zsh
, modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync
}:
let
version = "unstable-2018-03-15";
in stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "edid-generator";
inherit version;
version = "unstable-2018-03-15";
src = fetchFromGitHub {
owner = "akatrevorjay";

View File

@ -19,7 +19,6 @@ buildGoPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ pSub ];
platforms = platforms.unix;
inherit version;
};
}

View File

@ -3,13 +3,9 @@
libcxx
}:
let
version = "4.5.4";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "gringo";
inherit version;
version = "4.5.4";
src = fetchurl {
url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz";

View File

@ -1,9 +1,8 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, freeglut, libGL, libGLU }:
let version = "0.0.7"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "hdaps-gl";
inherit version;
version = "0.0.7";
src = fetchFromGitHub {
owner = "linux-thinkpad";
repo = "hdaps-gl";

View File

@ -7,12 +7,11 @@
}:
let
version = "0.48.1";
perl' = perl.withPackages (p: with p; [ ConvertASN1 perlldap AuthenSASL ]);
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "lbdb";
inherit version;
version = "0.48.1";
src = fetchurl {
url = "https://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz";
sha256 = "1gr5l2fr9qbdccga8bhsrpvz6jxigvfkdxrln9wyf2xpps5cdjxh";

View File

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
description = "Rewrite of unclutter using the X11 Xfixes extension";
platforms = platforms.unix;
license = lib.licenses.mit;
inherit version;
maintainers = [ maintainers.globin ];
};
}

View File

@ -59,7 +59,6 @@ mkDerivation rec {
'';
meta = with lib; {
inherit version;
description = "Cross-platform application for configuring any YubiKey over all USB interfaces";
homepage = "https://developers.yubico.com/yubikey-manager-qt/";
license = licenses.bsd2;

View File

@ -48,6 +48,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ samueldr ];
platforms = platforms.linux ++ platforms.darwin;
inherit version;
};
}

View File

@ -2,12 +2,9 @@
, fetchurl, fetchpatch
}:
let
version = "1.7";
in python2Packages.buildPythonApplication {
python2Packages.buildPythonApplication rec {
pname = "nixops";
inherit version;
version = "1.7";
src = fetchurl {
url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";

View File

@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
homepage = "http://www.garloff.de/kurt/linux/ddrescue/";
license = licenses.gpl2Plus;
inherit version;
updateWalker = true;
};
}

View File

@ -39,6 +39,5 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
updateWalker = true;
inherit version;
};
}

View File

@ -27,6 +27,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.bsd3;
downloadPage = "https://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
inherit version;
};
}

View File

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

View File

@ -4,8 +4,6 @@
, IOKit, ApplicationServices }:
let
version = "7.2";
dbrev = "5171";
drivedbBranch = "RELEASE_7_2_DRIVEDB";
driverdb = fetchurl {
@ -16,7 +14,7 @@ let
in stdenv.mkDerivation rec {
pname = "smartmontools";
inherit version;
version = "7.2";
src = fetchurl {
url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz";

View File

@ -1,8 +1,6 @@
{ lib, stdenv, fetchurl }:
let
version = "1.8.0";
# These settings are found in the Makefile, but there seems to be no
# way to select one ore the other setting other than editing the file
# manually, so we have to duplicate the know how here.
@ -23,9 +21,9 @@ let
'' else
""; # use linux flags by default
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "tree";
inherit version;
version = "1.8.0";
src = fetchurl {
url = "http://mama.indstate.edu/users/ice/tree/src/tree-${version}.tgz";

View File

@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/Openwsman/wsmancli/releases";
inherit (openwsman.meta) homepage license maintainers platforms;
inherit version;
};
}

View File

@ -67,6 +67,5 @@ stdenv.mkDerivation rec {
homepage = "https://jwilk.net/software/pdf2djvu";
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
inherit version;
};
}

View File

@ -44,6 +44,5 @@ in stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ peterhoeg ];
inherit version;
};
}