aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-12-12 15:36:00 +0100
committerlassulus <lassulus@lassul.us>2022-12-12 15:39:48 +0100
commit0dfe1e1d870168c5b8f46c26f5fdb8b55de61930 (patch)
treef6a63057f4e0619863429ac2cd455a0716a78839
parentf65c77bdcc58be2081a0ffbda849289c5191b5e8 (diff)
remove python2
-rw-r--r--ci.nix1
-rw-r--r--examples/hello_world.nix3
-rw-r--r--examples/simple.nix9
-rw-r--r--pkgs/default.nix15
4 files changed, 0 insertions, 28 deletions
diff --git a/ci.nix b/ci.nix
index 902d43c..266e176 100644
--- a/ci.nix
+++ b/ci.nix
@@ -20,7 +20,6 @@ in
haskell = writeTest "Rolf" simples.haskell;
js = writeTest "function add(n,d){return n+d}" simples.js;
perl = writeTest "Howdy!" simples.perl;
- python2 = writeTest "['some', 'random', 'variables']" simples.python2;
python3 = writeTest "['some', 'random', 'variables']" simples.python3;
sed = writeTest "hello world" simples.sed;
}
diff --git a/examples/hello_world.nix b/examples/hello_world.nix
index 4f9330a..f71804f 100644
--- a/examples/hello_world.nix
+++ b/examples/hello_world.nix
@@ -24,9 +24,6 @@ in {
perl = pkgs.writePerl "hello-world" {} ''
print "hello world\n";
'';
- python2 = pkgs.writePython2 "hello-world" {} ''
- print "hello world"
- '';
python3 = pkgs.writePython3 "hello-world" {} ''
print("hello world")
'';
diff --git a/examples/simple.nix b/examples/simple.nix
index 55ccedc..4ff3d9e 100644
--- a/examples/simple.nix
+++ b/examples/simple.nix
@@ -24,15 +24,6 @@ in {
use boolean;
print "Howdy!\n" if true;
'';
- python2 = pkgs.writePython2 "simple.py" { deps = [ pkgs.python2Packages.pyyaml ]; } ''
- import yaml
-
- print yaml.load("""
- - some
- - random
- - variables
- """)
- '';
python3 = pkgs.writePython3 "simple.py" { deps = [ pkgs.python3Packages.pyyaml ]; } ''
import yaml
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8c62f1b..a236d1d 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -447,21 +447,6 @@ pkgs: oldpkgs: {
writePerlBin = name:
pkgs.writePerl "/bin/${name}";
- writePython2 = name: { deps ? [], flakeIgnore ? [] }:
- let
- py = pkgs.python2.withPackages (ps: deps);
- ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}";
- in
- pkgs.makeScriptWriter {
- interpreter = "${py}/bin/python";
- check = pkgs.writeDash "python2check.sh" ''
- exec ${pkgs.python2Packages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"
- '';
- } name;
-
- writePython2Bin = name:
- pkgs.writePython2 "/bin/${name}";
-
writePython3 = name: { deps ? [], flakeIgnore ? [] }:
let
py = pkgs.python3.withPackages (ps: deps);