Merge pull request #156201 from AndersonTorres/new-misc

src: python3 instead of python2

Changed files
+36 -21
pkgs
applications
version-management
top-level
+19 -5
pkgs/applications/version-management/src/default.nix
···
-
{ lib, stdenv, fetchurl, python2, rcs, git, makeWrapper }:
+
{ lib
+
, stdenv
+
, fetchurl
+
, python
+
, rcs
+
, git
+
, makeWrapper
+
}:
stdenv.mkDerivation rec {
pname = "src";
···
sha256 = "sha256-Tc+qBhLtC9u23BrqVniAprAV8YhXELvbMn+XxN5BQkE=";
};
-
nativeBuildInputs = [ makeWrapper ];
-
buildInputs = [ python2 rcs git ];
+
nativeBuildInputs = [
+
makeWrapper
+
];
+
+
buildInputs = [
+
python
+
rcs
+
git
+
];
preConfigure = ''
patchShebangs .
···
'';
meta = with lib; {
+
homepage = "http://www.catb.org/esr/src/";
description = "Simple single-file revision control";
longDescription = ''
SRC, acronym of Simple Revision Control, is RCS/SCCS reloaded with a
···
will seem familiar to Subversion/Git/hg users, and no binary blobs
anywhere.
'';
-
homepage = "http://www.catb.org/esr/src/";
changelog = "https://gitlab.com/esr/src/raw/${version}/NEWS";
license = licenses.bsd2;
-
platforms = platforms.all;
maintainers = with maintainers; [ calvertvl AndersonTorres ];
+
inherit (python.meta) platforms;
};
}
+17 -16
pkgs/top-level/all-packages.nix
···
poly2tri-c = callPackage ../development/libraries/poly2tri-c { };
-
polymc = libsForQt5.callPackage ../games/polymc { };
-
ponysay = callPackage ../tools/misc/ponysay { };
popfile = callPackage ../tools/text/popfile { };
···
nsis = callPackage ../development/tools/nsis { };
+
tockloader = callPackage ../development/tools/misc/tockloader { };
+
### DEVELOPMENT / LIBRARIES
a52dec = callPackage ../development/libraries/a52dec { };
···
eigen = callPackage ../development/libraries/eigen {};
eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
+
+
vapoursynth = callPackage ../development/libraries/vapoursynth {
+
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
+
};
+
+
vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { };
+
+
vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { };
vmmlib = callPackage ../development/libraries/vmmlib {
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
···
src = callPackage ../applications/version-management/src {
git = gitMinimal;
+
python = python3;
sslyze = with python3Packages; toPythonApplication sslyze;
···
tesseract = tesseract3;
tetraproc = callPackage ../applications/audio/tetraproc { };
-
-
tetrio-desktop = callPackage ../games/tetrio-desktop { };
tev = callPackage ../applications/graphics/tev { };
···
portmod = callPackage ../games/portmod { };
+
tetrio-desktop = callPackage ../games/tetrio-desktop { };
+
tr-patcher = callPackage ../games/tr-patcher { };
tes3cmd = callPackage ../games/tes3cmd { };
+
+
otto-matic = callPackage ../games/otto-matic { };
openraPackages = import ../games/openra pkgs;
···
pioneers = callPackage ../games/pioneers { };
planetary_annihilation = callPackage ../games/planetaryannihilation { };
+
+
polymc = libsForQt5.callPackage ../games/polymc { };
pong3d = callPackage ../games/pong3d { };
···
tinyfugue = callPackage ../games/tinyfugue { };
-
tockloader = callPackage ../development/tools/misc/tockloader { };
-
tome2 = callPackage ../games/tome2 { };
tome4 = callPackage ../games/tome4 { };
···
ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { });
ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
-
-
vapoursynth = callPackage ../development/libraries/vapoursynth {
-
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-
};
-
-
vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { };
-
-
vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { };
vassal = callPackage ../games/vassal { };
···
ott = callPackage ../applications/science/logic/ott { };
otter = callPackage ../applications/science/logic/otter {};
-
-
otto-matic = callPackage ../games/otto-matic { };
picosat = callPackage ../applications/science/logic/picosat {};