1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-15 15:30:39 +00:00

treewide: replace '-git' packages with 'unstable-' in version (#145396)

This commit is contained in:
Felix Bühler 2021-11-10 22:21:47 +01:00 committed by GitHub
parent d4554c23a8
commit f5c12e8311
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 268 additions and 139 deletions
pkgs
applications
audio
foo-yc20
mod-distortion
orca-c
editors/supertux-editor
graphics/smartdeblur
misc
dfilemanager
yarssr
networking
instant-messengers/tensor
znc
development
compilers/eql
libraries
ocaml-modules/lwt
games
quake3/ioquake
vdrift
misc/drivers/moltengamepad
servers/tt-rss/plugin-ff-instagram
shells/fish/plugins/foreign-env
tools
X11
run-scaled
skippy-xd
xprintidle-ng
cd-dvd/vobsub2srt
graphics/qrcode
misc
clipnotify
colorpicker
networking/connman/connman_dmenu
security/tpm-luks
system/das_watchdog

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, libjack2, gtk2, lv2, faust, pkg-config }:
stdenv.mkDerivation {
version = "git-2015-05-21";
version = "unstable-2015-05-21";
pname = "foo-yc20";
src = fetchFromGitHub {
owner = "sampov2";

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, lv2 }:
stdenv.mkDerivation {
pname = "mod-distortion-git";
version = "2016-08-19";
pname = "mod-distortion";
version = "unstable-2016-08-19";
src = fetchFromGitHub {
owner = "portalmod";

View file

@ -1,8 +1,7 @@
{ lib, stdenv, fetchgit, ncurses, portmidi }:
stdenv.mkDerivation {
pname = "orca-c";
version = "git-2021-02-13";
version = "unstable-2021-02-13";
src = fetchgit {
url = "https://git.sr.ht/~rabbits/orca";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }:
stdenv.mkDerivation {
version = "git-2014-08-20";
version = "unstable-2014-08-20";
pname = "supertux-editor";
src = fetchFromGitHub {

View file

@ -1,14 +1,12 @@
{ fetchurl, lib, stdenv, cmake, qt4, fftw }:
let
rev = "9895036d26";
in
stdenv.mkDerivation rec {
name = "smartdeblur-git-${rev}";
pname = "smartdeblur";
version = "unstable-2013-01-09";
src = fetchurl {
url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/${rev}";
name = "${name}.tar.gz";
url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26";
name = "smartdeblur-${version}.tar.gz";
sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4";
};

View file

@ -2,7 +2,7 @@
mkDerivation {
pname = "dfilemanager";
version = "git-2020-09-04";
version = "unstable-2020-09-04";
src = fetchFromGitHub {
owner = "probonopd";

View file

@ -2,16 +2,33 @@
let
perlDeps = with perlPackages; [
Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon
XMLLibXML XMLSAXBase XMLParser XMLRSS
Glib
Gtk2
Gnome2
Pango
Cairo
Gnome2Canvas
Gnome2VFS
Gtk2GladeXML
Gtk2TrayIcon
XMLLibXML
XMLSAXBase
XMLParser
XMLRSS
HTMLParser
DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone
DateTime
DateTimeFormatMail
DateTimeFormatW3CDTF
DateTimeLocale
DateTimeTimeZone
ParamsValidate
ModuleImplementation ModuleRuntime
ModuleImplementation
ModuleRuntime
TryTiny
ClassSingleton
URI
AnyEvent AnyEventHTTP
AnyEvent
AnyEventHTTP
commonsense
FileSlurp
JSON
@ -24,7 +41,7 @@ let
];
in
stdenv.mkDerivation {
version = "git-2017-12-01";
version = "unstable-2017-12-01";
pname = "yarssr";
src = fetchFromGitHub {

View file

@ -1,12 +1,19 @@
{ mkDerivation, lib, stdenv, fetchgit, qtbase, qtquickcontrols, qmake
, makeDesktopItem }:
{ mkDerivation
, lib
, stdenv
, fetchgit
, qtbase
, qtquickcontrols
, qmake
, makeDesktopItem
}:
# we now have libqmatrixclient so a future version of tensor that supports it
# should use that
mkDerivation rec {
pname = "tensor-git";
version = "2017-02-21";
pname = "tensor";
version = "unstable-2017-02-21";
src = fetchgit {
url = "https://github.com/davidar/tensor.git";

View file

@ -1,10 +1,13 @@
{ lib, stdenv, fetchFromGitHub, znc }:
let
zncDerivation = a@{
pname, src, module_name,
buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ...
zncDerivation =
a@{ pname
, src
, module_name
, buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp"
, installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so"
, ...
}: stdenv.mkDerivation (a // {
inherit buildPhase;
inherit installPhase;
@ -15,11 +18,12 @@ let
passthru.module_name = module_name;
});
in {
in
{
backlog = zncDerivation rec {
pname = "znc-backlog";
version = "git-2017-06-13";
version = "unstable-2017-06-13";
module_name = "backlog";
src = fetchFromGitHub {
@ -39,7 +43,7 @@ in {
clientbuffer = zncDerivation rec {
pname = "znc-clientbuffer";
version = "git-2020-04-24";
version = "unstable-2020-04-24";
module_name = "clientbuffer";
src = fetchFromGitHub {
@ -59,7 +63,7 @@ in {
clientaway = zncDerivation rec {
pname = "znc-clientaway";
version = "git-2017-04-28";
version = "unstable-2017-04-28";
module_name = "clientaway";
src = fetchFromGitHub {
@ -79,7 +83,7 @@ in {
fish = zncDerivation rec {
pname = "znc-fish";
version = "git-2017-06-26";
version = "unstable-2017-06-26";
module_name = "fish";
src = fetchFromGitHub {
@ -99,7 +103,7 @@ in {
ignore = zncDerivation rec {
pname = "znc-ignore";
version = "git-2017-04-28";
version = "unstable-2017-04-28";
module_name = "ignore";
src = fetchFromGitHub {
@ -139,7 +143,7 @@ in {
playback = zncDerivation rec {
pname = "znc-playback";
version = "git-2015-08-04";
version = "unstable-2015-08-04";
module_name = "playback";
src = fetchFromGitHub {
@ -159,7 +163,7 @@ in {
privmsg = zncDerivation rec {
pname = "znc-privmsg";
version = "git-2015-02-22";
version = "unstable-2015-02-22";
module_name = "privmsg";
src = fetchFromGitHub {
@ -177,7 +181,7 @@ in {
push = zncDerivation rec {
pname = "znc-push";
version = "git-2016-10-12";
version = "unstable-2016-10-12";
module_name = "push";
src = fetchFromGitHub {

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }:
stdenv.mkDerivation rec {
version = src.rev;
pname = "eql-git";
version = "unstable-2012-12-10";
pname = "eql";
src = fetchgit {
rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
url = "https://gitlab.com/eql/eql.git";

View file

@ -2,7 +2,9 @@
, fetchFromGitHub
, lib
, subproject ? "library" # one of "library", "reader" or "writer"
, zlib, libpng, libtiff
, zlib
, libpng
, libtiff
, jabcode
}:
let
@ -11,9 +13,10 @@ let
"reader" = "jabcodeReader";
"writer" = "jabcodeWriter";
};
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "jabcode-${subproject}";
version = "git-2020-05-13";
version = "unstable-2020-05-13";
src = fetchFromGitHub {
repo = "jabcode";
owner = "jabcode";
@ -27,7 +30,8 @@ in stdenv.mkDerivation rec {
preConfigure = "cd src/${subdir}";
installPhase = if subproject == "library" then ''
installPhase =
if subproject == "library" then ''
mkdir -p $out/lib
cp build/* $out/lib
'' else ''

View file

@ -1,22 +1,42 @@
{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
, qtbase, qtmultimedia, qtquick1, qttools
, libGL, libX11
, libass, openal, ffmpeg, libuchardet
, alsa-lib, libpulseaudio, libva
{ mkDerivation
, lib
, fetchFromGitHub
, extra-cmake-modules
, qtbase
, qtmultimedia
, qtquick1
, qttools
, libGL
, libX11
, libass
, openal
, ffmpeg
, libuchardet
, alsa-lib
, libpulseaudio
, libva
}:
with lib;
mkDerivation rec {
pname = "libqtav";
version = "git-2020-09-10";
version = "unstable-2020-09-10";
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
qtbase qtmultimedia qtquick1
libGL libX11
libass openal ffmpeg libuchardet
alsa-lib libpulseaudio libva
qtbase
qtmultimedia
qtquick1
libGL
libX11
libass
openal
ffmpeg
libuchardet
alsa-lib
libpulseaudio
libva
];
src = fetchFromGitHub {

View file

@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "lwt_camlp4";
version = "git-20180325";
version = "unstable-2018-03-25";
src = fetchFromGitHub {
owner = "ocsigen";

View file

@ -1,10 +1,25 @@
{ lib, stdenv, fetchFromGitHub, which, pkg-config, SDL2, libGL, openalSoft
, curl, speex, opusfile, libogg, libvorbis, libopus, libjpeg, mumble, freetype
{ lib
, stdenv
, fetchFromGitHub
, which
, pkg-config
, SDL2
, libGL
, openalSoft
, curl
, speex
, opusfile
, libogg
, libvorbis
, libopus
, libjpeg
, mumble
, freetype
}:
stdenv.mkDerivation {
pname = "ioquake3-git";
version = "2021-07-20";
pname = "ioquake3";
version = "unstable-2021-07-20";
src = fetchFromGitHub {
owner = "ioquake";
@ -15,8 +30,18 @@ stdenv.mkDerivation {
nativeBuildInputs = [ which pkg-config ];
buildInputs = [
SDL2 libGL openalSoft curl speex opusfile libogg libvorbis libopus libjpeg
freetype mumble
SDL2
libGL
openalSoft
curl
speex
opusfile
libogg
libvorbis
libopus
libjpeg
freetype
mumble
];
enableParallelBuilding = true;

View file

@ -1,5 +1,18 @@
{ lib, stdenv, fetchFromGitHub, fetchsvn, pkg-config, sconsPackages, libGLU, libGL, SDL2, SDL2_image
, libvorbis, bullet, curl, gettext, writeTextFile
{ lib
, stdenv
, fetchFromGitHub
, fetchsvn
, pkg-config
, sconsPackages
, libGLU
, libGL
, SDL2
, SDL2_image
, libvorbis
, bullet
, curl
, gettext
, writeTextFile
, data ? fetchsvn {
url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data";
@ -8,7 +21,7 @@
}
}:
let
version = "git";
version = "unstable-2017-12-09";
bin = stdenv.mkDerivation {
pname = "vdrift";
inherit version;

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, udev }:
stdenv.mkDerivation {
pname = "moltengamepad-git";
version = "2016-05-04";
pname = "moltengamepad";
version = "unstable-2016-05-04";
src = fetchFromGitHub {
owner = "jgeumlek";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "tt-rss-plugin-ff-instagram";
version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
version = "unstable-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6
src = fetchFromGitHub {
owner = "wltb";

View file

@ -2,7 +2,7 @@
buildFishPlugin {
pname = "foreign-env";
version = "git-20200209";
version = "unstable-2020-02-09";
src = fetchFromGitHub {
owner = "oh-my-fish";

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }:
stdenv.mkDerivation {
version = "git-2018-06-03";
version = "unstable-2018-06-03";
pname = "run-scaled";
src = fetchFromGitHub {

View file

@ -1,14 +1,33 @@
{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
, libXext, libXinerama, libjpeg, giflib, pkg-config
{ lib
, stdenv
, fetchgit
, xorgproto
, libX11
, libXft
, libXcomposite
, libXdamage
, libXext
, libXinerama
, libjpeg
, giflib
, pkg-config
}:
let
buildInputs = [
xorgproto libX11 libXft libXcomposite libXdamage libXext
libXinerama libjpeg giflib pkg-config
xorgproto
libX11
libXft
libXcomposite
libXdamage
libXext
libXinerama
libjpeg
giflib
pkg-config
];
in
stdenv.mkDerivation rec {
version = "git-2015-03-01";
version = "unstable-2015-03-01";
pname = "skippy-xd";
inherit buildInputs;
src = fetchgit {

View file

@ -1,11 +1,24 @@
{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
, autoconf, automake, libtool, gettext, pkg-config
, git, perl, texinfo, help2man
{ lib
, stdenv
, fetchFromGitHub
, libX11
, libXScrnSaver
, libXext
, gnulib
, autoconf
, automake
, libtool
, gettext
, pkg-config
, git
, perl
, texinfo
, help2man
}:
stdenv.mkDerivation rec {
pname = "xprintidle-ng";
version = "git-2015-09-01";
version = "unstable-2015-09-01";
src = fetchFromGitHub {
owner = "taktoa";
@ -20,8 +33,16 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
autoconf automake gettext git gnulib
help2man libtool perl pkg-config texinfo
autoconf
automake
gettext
git
gnulib
help2man
libtool
perl
pkg-config
texinfo
];
configurePhase = ''
@ -30,7 +51,9 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
libX11 libXScrnSaver libXext
libX11
libXScrnSaver
libXext
];
meta = {

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
stdenv.mkDerivation rec {
pname = "vobsub2srt-git";
version = "20140817-${builtins.substring 0 7 rev}";
pname = "vobsub2srt";
version = "unstable-2014-08-17";
rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
src = fetchgit {

View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "qrcode-git";
version = "20160804";
pname = "qrcode";
version = "unstable-2016-08-04";
src = fetchFromGitHub {
owner = "qsantos";

View file

@ -1,7 +1,7 @@
{ libX11, libXfixes, lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "clipnotify";
version = "git-2018-02-20";
version = "unstable-2018-02-20";
src = fetchFromGitHub {
owner = "cdown";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "colorpicker";
version = "git-2018-01-14";
version = "unstable-2018-01-14";
src = fetchFromGitHub {
owner = "Ancurio";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "connman_dmenu";
version = "git-29-9-2015";
version = "unstable-2015-09-29";
src = fetchFromGitHub {
owner = "march-linux";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "tpm-luks";
version = "git-2015-07-11";
version = "unstable-2015-07-11";
src = fetchgit {
url = "https://github.com/momiji/tpm-luks";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "das_watchdog";
version = "git-2015-09-12";
version = "unstable-2015-09-12";
src = fetchgit {
url = "https://github.com/kmatheussen/das_watchdog.git";