From 48d21642e5ef417c6a5e15f751e0c69f1b5573db Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sat, 11 Dec 2021 02:18:42 +0100 Subject: [PATCH 01/33] rofi-wayland: init at 1.7.2+wayland1 --- pkgs/applications/misc/rofi/wayland.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/rofi/wayland.nix diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix new file mode 100644 index 000000000000..c2c2da37b4e7 --- /dev/null +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub +, rofi-unwrapped +, wayland-protocols +, wayland +}: + +rofi-unwrapped.overrideAttrs (oldAttrs: rec { + pname = "rofi-wayland-unwrapped"; + version = "1.7.2+wayland1"; + + src = fetchFromGitHub { + owner = "lbonn"; + repo = "rofi"; + rev = version; + fetchSubmodules = true; + sha256 = "sha256-INFYHOVjBNj8ks4UjKnxLW8mL7h1c8ySFPS/rUxOWwo="; + }; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ]; + buildInputs = oldAttrs.buildInputs ++ [ wayland ]; + + meta = with lib; { + description = "Window switcher, run dialog and dmenu replacement for Wayland"; + homepage = "https://github.com/lbonn/rofi"; + license = licenses.mit; + maintainers = with maintainers; [ bew ]; + platforms = with platforms; linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bd1380e027d..a860f9f656dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28194,6 +28194,10 @@ with pkgs; rofi-unwrapped = callPackage ../applications/misc/rofi { }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; + rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { }; + rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix { + rofi-unwrapped = rofi-wayland-unwrapped; + }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; From e03355561ae6bb922c8daf31ac0bea8f43c7f486 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jan 2022 20:52:02 +0000 Subject: [PATCH 02/33] klibc: 2.0.9 -> 2.0.10 --- pkgs/os-specific/linux/klibc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 522a74dea01a..6efcb01cc531 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "sha256-bcynCJEzINJjCfBbDCv2gHG/EbPa3MTmx9kjg3/CPuE="; + sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; From 6a69cda1d53b9389af82cd8e0953b041c544a19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sat, 2 Oct 2021 18:07:28 +0700 Subject: [PATCH 03/33] blackshades: 1.3.1 -> 2.4.7 --- pkgs/games/blackshades/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index bd29c7b616c4..76f22e98d9e9 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,29 +1,27 @@ { lib, stdenv, fetchFromSourcehut -, SDL, stb, libGLU, libGL, openal, libvorbis, freealut }: +, zig, glfw, libGLU, libGL, openal, libsndfile }: stdenv.mkDerivation rec { pname = "blackshades"; - version = "1.3.1"; + version = "2.4.7"; src = fetchFromSourcehut { owner = "~cnx"; repo = pname; rev = version; - sha256 = "0yzp74ynkcp6hh5m4zmvrgx5gwm186hq7p3m7qkww54qdyijb3rv"; + fetchSubmodules = true; + sha256 = "sha256-hvJwWUUmGeb7MQgKe79cPS2ckPZ9z0Yc5S9IiwuXPD8="; }; - buildInputs = [ SDL stb libGLU libGL openal libvorbis freealut ]; + nativeBuildInputs = [ zig ]; + buildInputs = [ glfw libGLU libGL openal libsndfile ]; - postPatch = '' - sed -i -e s,Data/,$out/share/$pname/,g \ - -e s,Data:,$out/share/$pname/,g \ - src/*.cpp + preBuild = '' + export HOME=$TMPDIR ''; installPhase = '' - mkdir -p $out/bin $out/share - cp build/blackshades $out/bin - cp -R Data $out/share/$pname + zig build -Drelease-fast -Dcpu=baseline --prefix $out install ''; meta = { From bd8132ac625ddd87fda0bb43f493608e6654c508 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sun, 14 Nov 2021 00:45:50 +0900 Subject: [PATCH 04/33] noto-fonts-cjk: add missing serif font Fixes #99940 --- .../from_md/release-notes/rl-2205.section.xml | 12 +++ .../manual/release-notes/rl-2205.section.md | 6 ++ pkgs/data/fonts/noto-fonts/default.nix | 80 +++++++++++-------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 +- 5 files changed, 72 insertions(+), 34 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index c453d9762d11..0e9b5a79a8c7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -357,6 +357,18 @@ ~/.local/share/polymc/polymc.cfg. + + + pkgs.noto-fonts-cjk is now deprecated in + favor of pkgs.noto-fonts-cjk-sans and + pkgs.noto-fonts-cjk-serif because they each + have different release schedules. To maintain compatibility + with prior releases of Nixpkgs, + pkgs.noto-fonts-cjk is currently an alias + of pkgs.noto-fonts-cjk-sans and doesn’t + include serif fonts. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 88ceb902bb60..644abf75128a 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -111,6 +111,12 @@ In addition to numerous new and upgraded packages, this release has the followin - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. +- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` + and `pkgs.noto-fonts-cjk-serif` because they each have different release + schedules. To maintain compatibility with prior releases of Nixpkgs, + `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and + doesn't include serif fonts. + ## Other Notable Changes {#sec-release-22.05-notable-changes} - The option [services.redis.servers](#opt-services.redis.servers) was added diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index d6b4488daf05..11f911aeb470 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -3,7 +3,6 @@ , lib , fetchFromGitHub , fetchurl -, fetchzip , cairo , python3 , pkg-config @@ -61,6 +60,42 @@ let maintainers = with maintainers; [ mathnerd314 emily ]; }; }; + + mkNotoCJK = { typeface, version, rev, sha256 }: + stdenvNoCC.mkDerivation { + pname = "noto-fonts-cjk-${lib.toLower typeface}"; + inherit version; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "noto-cjk"; + inherit rev sha256; + }; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc + ''; + + meta = with lib; { + description = "Beautiful and free fonts for CJK languages"; + homepage = "https://www.google.com/get/noto/help/cjk/"; + longDescription = '' + Noto ${typeface} CJK is a ${lib.toLower typeface} typeface designed as + an intermediate style between the modern and traditional. It is + intended to be a multi-purpose digital font for user interface + designs, digital content, reading on laptops, mobile devices, and + electronic books. Noto ${typeface} CJK comprehensively covers + Simplified Chinese, Traditional Chinese, Japanese, and Korean in a + unified font family. It supports regional variants of ideographic + characters for each of the four languages. In addition, it supports + Japanese kana, vertical forms, and variant characters (itaiji); it + supports Korean hangeul — both contemporary and archaic. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 emily ]; + }; + }; in { @@ -74,39 +109,18 @@ in weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*"; }; - noto-fonts-cjk = let zip = fetchzip { - url = let rev = "be6c059ac1587e556e2412b27f5155c8eb3ddbe6"; in - "https://raw.githubusercontent.com/googlefonts/noto-cjk/${rev}/NotoSansCJK.ttc.zip"; - # __MACOSX... - stripRoot = false; - sha256 = "0ik4z2b15i0pghskgfm3adzb0h35fr4gyzvz3bq49hhkhn9h85vi"; - }; in stdenvNoCC.mkDerivation { - pname = "noto-fonts-cjk"; - version = "2.001"; + noto-fonts-cjk-sans = mkNotoCJK { + typeface = "Sans"; + version = "2.004"; + rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; + sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + }; - buildCommand = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${zip}/*.ttc - ''; - - meta = with lib; { - description = "Beautiful and free fonts for CJK languages"; - homepage = "https://www.google.com/get/noto/help/cjk/"; - longDescription = - '' - Noto Sans CJK is a sans serif typeface designed as an intermediate style - between the modern and traditional. It is intended to be a multi-purpose - digital font for user interface designs, digital content, reading on laptops, - mobile devices, and electronic books. Noto Sans CJK comprehensively covers - Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font - family. It supports regional variants of ideographic characters for each of the - four languages. In addition, it supports Japanese kana, vertical forms, and - variant characters (itaiji); it supports Korean hangeul — both contemporary and - archaic. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 emily ]; - }; + noto-fonts-cjk-serif = mkNotoCJK { + typeface = "Serif"; + version = "2.000"; + rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; + sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; }; noto-fonts-emoji = let diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b90cbf2b7e1..8ea44ad6fa9d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -656,6 +656,7 @@ mapAliases ({ nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27 + noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05 nxproxy = nx-libs; # added 2019-02-15 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 674228efc6b9..99344d573545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23719,7 +23719,12 @@ with pkgs; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; inherit (callPackages ../data/fonts/noto-fonts {}) - noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + noto-fonts-emoji-blob-bin + noto-fonts-extra; nuclear = callPackage ../applications/audio/nuclear { }; From d4ebae105499a59da3d255f39dd4baedac1953c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 00:27:05 +0000 Subject: [PATCH 05/33] heroic: remove unused argument --- pkgs/games/heroic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index a877eed6213f..bcbe2a6c6535 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, python, gsettings-desktop-schemas, gtk3 }: +{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: let pname = "heroic"; From b93149c11fb54ffe1068a31e66c5ab095a8ee236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 05:10:52 +0000 Subject: [PATCH 06/33] rsyslog: use top-level docutils --- pkgs/tools/system/rsyslog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index acf56b1558f1..d27985edbc4d 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, docutils, fastJson , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null , libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc + fastJson libestr json_c zlib docutils libkrb5 jemalloc postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc libmaxminddb From 17f8d7ea533378189a4a674de5864a929ff22931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 05:22:17 +0000 Subject: [PATCH 07/33] schismtracker: use python3 --- pkgs/applications/audio/schismtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index bf74dd64f926..ce55516a40d4 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , alsa-lib -, python +, python3 , SDL }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-dependency-tracking" ] ++ lib.optional stdenv.isDarwin "--disable-sdltest"; - nativeBuildInputs = [ autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib; From ea6b67af0b1ddac14d2b3b8471cd2a98300078f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 05:27:08 +0000 Subject: [PATCH 08/33] seasocks: use python3 --- pkgs/development/libraries/seasocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index 8c5b4e87d9bb..fd53db0dcf91 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib }: stdenv.mkDerivation rec { pname = "seasocks"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python ]; + buildInputs = [ zlib python3 ]; meta = with lib; { homepage = "https://github.com/mattgodbolt/seasocks"; From 0d6e7fed1ea34cbdfe6bba6aad56014d673acf6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 05:31:51 +0000 Subject: [PATCH 09/33] shocco: use python3 --- pkgs/tools/text/shocco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix index 11d8194bb702..1359db98978c 100644 --- a/pkgs/tools/text/shocco/default.nix +++ b/pkgs/tools/text/shocco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perlPackages, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, perlPackages, python3 }: stdenv.mkDerivation rec { pname = "shocco"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace PATH= NIRVANA= ''; - buildInputs = [ perlPackages.TextMarkdown pythonPackages.pygments ]; + buildInputs = [ perlPackages.TextMarkdown python3.pkgs.pygments ]; meta = with lib; { description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell"; From 65e959eb9a1e88d65c03c732fdb514182327c39d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 05:54:32 +0000 Subject: [PATCH 10/33] tebreak: also use python3 for tests --- .../applications/science/biology/tebreak/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix index cb606a6b3463..e56d91dc2cd1 100644 --- a/pkgs/applications/science/biology/tebreak/default.nix +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa -, samtools, findutils, python }: +{ lib, fetchFromGitHub, last, exonerate, minia, python3, bwa +, samtools, findutils }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tebreak"; version = "1.1"; @@ -12,8 +12,8 @@ python3Packages.buildPythonApplication rec { sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz"; }; - nativeBuildInputs = [ findutils python3Packages.cython ]; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = [ findutils python3.pkgs.cython ]; + propagatedBuildInputs = with python3.pkgs; [ pysam scipy bx-python @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { checkPhase = '' $out/bin/tebreak -b test/data/example.ins.bam -r test/data/Homo_sapiens_chr4_50000000-60000000_assembly19.fasta -p 4 --pickle test/example.pickle --detail_out test/example.tebreak.detail.out -i lib/teref.human.fa pushd test - ${python.interpreter} checktest.py + ${python3.interpreter} checktest.py ''; meta = with lib; { From 3c25beab40840bafbf848746bf5076ecd9b59cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 06:05:31 +0000 Subject: [PATCH 11/33] tiledb: use python3 --- pkgs/development/libraries/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 6bc0d3ef7534..19ebadd895f1 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -13,7 +13,7 @@ , libpqxx , clang-tools , catch2 -, python +, python3 , gtest , doxygen , fixDarwinDylibNames @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ clang-tools cmake - python + python3 doxygen ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; From 6bd52538ebe0f325f53572eeea8354abfb357b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Jan 2022 07:03:35 +0000 Subject: [PATCH 12/33] openbabel3: use python3 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f6bdc844ef9..219dae511346 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19122,7 +19122,9 @@ with pkgs; openbabel2 = callPackage ../development/libraries/openbabel/2.nix { }; - openbabel3 = callPackage ../development/libraries/openbabel { }; + openbabel3 = callPackage ../development/libraries/openbabel { + python = python3; + }; opencascade = callPackage ../development/libraries/opencascade { inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; From 1e398ec1ee9fa3480355136a09ddde0bd52c453a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Jan 2022 16:58:52 +0000 Subject: [PATCH 13/33] rhvoice: does not depend on python at runtime --- pkgs/applications/audio/rhvoice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index af35ad829dda..ca51001dd62e 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages -, python, glibmm, libpulseaudio, libao }: +, glibmm, libpulseaudio, libao }: let version = "unstable-2018-02-10"; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - python glibmm libpulseaudio libao + glibmm libpulseaudio libao ]; # SConstruct patch From 6fcf587ea7134e5245f5747c71e1a135b68d56a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Jan 2022 18:12:23 +0000 Subject: [PATCH 14/33] split2flac: use python3Packages.mutagen --- pkgs/applications/audio/split2flac/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix index 92f0753fd783..5de48d1b296f 100644 --- a/pkgs/applications/audio/split2flac/default.nix +++ b/pkgs/applications/audio/split2flac/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeWrapper , shntool, cuetools , flac, faac, mp4v2, wavpack, mac -, imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools +, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools , aacgain, mp3gain, vorbisgain }: @@ -12,7 +12,7 @@ let --prefix PATH : ${lib.makeBinPath [ shntool cuetools flac faac mp4v2 wavpack mac - imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools + imagemagick libiconv enca lame mutagen vorbis-tools aacgain mp3gain vorbisgain ]} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 219dae511346..e73d300fd21a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28503,7 +28503,9 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; - split2flac = callPackage ../applications/audio/split2flac { }; + split2flac = callPackage ../applications/audio/split2flac { + inherit (python3.pkgs) mutagen; + }; spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { }; From 6599e769647a93048e935b8f8273e62cdb016e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Jan 2022 18:18:52 +0000 Subject: [PATCH 15/33] netbeans: does not use python --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 0c40f83b67fa..f7614e76ef54 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick -, jdk, perl, python +, jdk, perl }: let @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ perl python libicns imagemagick ]; + buildInputs = [ perl libicns imagemagick ]; meta = { description = "An integrated development environment for Java, C, C++ and PHP"; From 9356c3472c3c0a31fb5d6b9640ef7c958f76795c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Jan 2022 18:25:55 +0000 Subject: [PATCH 16/33] sorcer: does not use python --- pkgs/applications/audio/sorcer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 59c7d91a3e38..e5e875f6df39 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }: +{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config }: stdenv.mkDerivation rec { pname = "sorcer"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost cairomm libsndfile lv2 ntk python ]; + buildInputs = [ boost cairomm libsndfile lv2 ntk ]; postPatch = '' # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 From d5cceedbd13767b1770c0baac001167f3bf6d5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 11 Jan 2022 23:40:02 +0000 Subject: [PATCH 17/33] python,pythonPackages: make aliases Since aliases are disallowed in nixpkgs, this makes usage of Python 2 which is EOL more explicit. --- .../blockchains/chia-plotter/default.nix | 4 ++-- pkgs/applications/editors/tiled/default.nix | 4 ++-- .../editors/wxhexeditor/default.nix | 4 ++-- .../graphics/screencloud/default.nix | 6 ++--- pkgs/applications/misc/ocropus/default.nix | 6 ++--- pkgs/applications/misc/pdfdiff/default.nix | 8 +++---- pkgs/applications/misc/phwmon/default.nix | 8 +++---- pkgs/applications/misc/survex/default.nix | 4 ++-- pkgs/applications/misc/weather/default.nix | 6 ++--- .../purple-plugin-pack/default.nix | 4 ++-- .../instant-messengers/torchat/default.nix | 8 +++---- .../networking/p2p/twister/default.nix | 5 +++- pkgs/applications/radio/soapysdr/default.nix | 3 ++- .../science/biology/poretools/default.nix | 6 ++--- .../machine-learning/shogun/default.nix | 8 +++---- .../science/misc/sasview/default.nix | 24 +++++++++---------- .../science/misc/tulip/default.nix | 4 ++-- .../version-management/rapidsvn/default.nix | 4 ++-- .../version-management/src/default.nix | 4 ++-- .../version-management/srcml/default.nix | 4 ++-- .../window-managers/wmii-hg/default.nix | 4 ++-- pkgs/development/compilers/hip/default.nix | 6 ++--- .../development/interpreters/acl2/default.nix | 4 ++-- .../clojurescript/lumo/default.nix | 4 ++-- .../interpreters/wasmtime/default.nix | 4 ++-- pkgs/development/libraries/blitz/default.nix | 4 ++-- pkgs/development/libraries/ntrack/default.nix | 4 ++-- pkgs/development/libraries/openbabel/2.nix | 4 ++-- pkgs/development/libraries/opencv/default.nix | 6 ++--- .../libraries/pcmsolver/default.nix | 4 ++-- .../libraries/physics/fastjet/default.nix | 2 +- pkgs/development/libraries/ptex/default.nix | 4 ++-- .../rabbitmq-java-client/default.nix | 4 ++-- pkgs/development/libraries/snack/default.nix | 6 ++--- .../development/libraries/swiften/default.nix | 4 ++-- .../ocaml-modules/llvm/default.nix | 4 ++-- .../ocaml-modules/pycaml/default.nix | 4 ++-- .../tools/analysis/oclgrind/default.nix | 4 ++-- .../tools/analysis/qcachegrind/default.nix | 4 ++-- .../tools/database/pyrseas/default.nix | 16 ++++++------- .../tools/misc/uncrustify/default.nix | 4 ++-- pkgs/development/tools/phantomjs2/default.nix | 4 ++-- pkgs/development/tools/udis86/default.nix | 4 ++-- pkgs/development/tools/winpdb/default.nix | 6 ++--- pkgs/games/openra/common.nix | 6 ++--- pkgs/games/tennix/default.nix | 4 ++-- pkgs/misc/emulators/retrofe/default.nix | 4 ++-- pkgs/misc/emulators/wxmupen64plus/default.nix | 4 ++-- .../misc/screensavers/xtrlock-pam/default.nix | 4 ++-- pkgs/misc/vim-plugins/overrides.nix | 8 +++---- pkgs/os-specific/linux/pam_usb/default.nix | 4 ++-- pkgs/os-specific/linux/pflask/default.nix | 4 ++-- pkgs/os-specific/linux/smem/default.nix | 4 ++-- .../os-specific/linux/speedometer/default.nix | 6 ++--- pkgs/os-specific/linux/x86info/default.nix | 4 ++-- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- pkgs/servers/computing/storm/default.nix | 8 +++---- pkgs/servers/mapserver/default.nix | 4 ++-- pkgs/servers/sql/proxysql/default.nix | 4 ++-- pkgs/servers/tvheadend/default.nix | 4 ++-- pkgs/shells/zsh/zsh-git-prompt/default.nix | 4 ++-- pkgs/tools/filesystems/xtreemfs/default.nix | 4 ++-- pkgs/tools/misc/grub/trusted.nix | 4 ++-- pkgs/tools/misc/opentsdb/default.nix | 4 ++-- pkgs/tools/misc/rpm-ostree/default.nix | 4 ++-- pkgs/tools/misc/snapper/default.nix | 4 ++-- .../networking/nss-pam-ldapd/default.nix | 4 ++-- pkgs/tools/networking/philter/default.nix | 4 ++-- pkgs/tools/networking/pssh/default.nix | 4 ++-- .../networking/py-wmi-client/default.nix | 6 ++--- pkgs/tools/networking/weighttp/default.nix | 4 ++-- pkgs/tools/security/volatility/default.nix | 6 ++--- pkgs/tools/system/collectd/plugins.nix | 4 ++-- pkgs/tools/system/ps_mem/default.nix | 4 ++-- .../system/syslog-ng-incubator/default.nix | 4 ++-- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- pkgs/tools/text/opencc/default.nix | 4 ++-- pkgs/tools/text/txt2tags/default.nix | 6 ++--- pkgs/tools/typesetting/odpdown/default.nix | 8 +++---- pkgs/tools/video/vnc2flv/default.nix | 4 ++-- .../xe-guest-utilities/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 23 ++++++------------ pkgs/top-level/python-packages.nix | 4 ++-- pkgs/top-level/release.nix | 6 ++--- 85 files changed, 221 insertions(+), 223 deletions(-) diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix index b576cd2373ce..51ca4469bc48 100644 --- a/pkgs/applications/blockchains/chia-plotter/default.nix +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -4,7 +4,7 @@ , libsodium , cmake , substituteAll -, pythonPackages +, python3Packages }: stdenv.mkDerivation { @@ -23,7 +23,7 @@ stdenv.mkDerivation { # prevent CMake from trying to get libraries on the Internet (substituteAll { src = ./dont_fetch_dependencies.patch; - pybind11_src = pythonPackages.pybind11.src; + pybind11_src = python3Packages.pybind11.src; relic_src = fetchFromGitHub { owner = "relic-toolkit"; repo = "relic"; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4a53d585feae..2c3ddbf80b88 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python, qtbase, qttools }: +, python2, qtbase, qttools }: mkDerivation rec { pname = "tiled"; @@ -13,7 +13,7 @@ mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python qtbase qttools ]; + buildInputs = [ python2 qtbase qttools ]; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 09037b2f0c3c..c769ab426312 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }: stdenv.mkDerivation rec { pname = "wxHexEditor"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj"; }; - buildInputs = [ wxGTK autoconf automake libtool python gettext ]; + buildInputs = [ wxGTK autoconf automake libtool python2 gettext ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index b7d6ecdef3d7..b62ca680cbc5 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }: with lib; stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ]; + buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ]; patchPhase = '' # Required to make the configure script work. Normally, screencloud's @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { postInstall = '' patchShebangs $prefix/opt/screencloud/screencloud.sh substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt" - sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" + sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh" mkdir $prefix/bin mkdir $prefix/lib ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 507399c012bb..41c6cdee41ca 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }: +{ lib, fetchFromGitHub, fetchurl, python2Packages, curl }: let getmodel = name: sha256: { @@ -17,7 +17,7 @@ let ]; in -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "ocropus"; version = "1.3.3"; @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { owner = "tmbdev"; }; - propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow + propagatedBuildInputs = with python2Packages; [ curl numpy scipy pillow matplotlib beautifulsoup4 pygtk lxml ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 65ee6a655930..20a953384971 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchurl, xpdf }: +{ lib, python2Packages, fetchurl, xpdf }: let - py = pythonPackages; + py = python2Packages; in py.buildPythonApplication rec { name = "pdfdiff-${version}"; @@ -11,7 +11,7 @@ py.buildPythonApplication rec { sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836"; }; - buildInputs = [ pythonPackages.wrapPython ]; + buildInputs = [ python2Packages.wrapPython ]; dontConfigure = true; dontBuild = true; @@ -29,7 +29,7 @@ py.buildPythonApplication rec { cp pdfdiff.py $out/bin/pdfdiff chmod +x $out/bin/pdfdiff - substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${pythonPackages.python.interpreter}" + substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${python2Packages.python.interpreter}" ''; meta = with lib; { diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 717c5c3feb10..22d94006ddca 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pythonPackages }: +{ lib, stdenv, fetchFromGitLab, python2Packages }: stdenv.mkDerivation { pname = "phwmon"; @@ -11,11 +11,11 @@ stdenv.mkDerivation { sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq"; }; - nativeBuildInputs = [ pythonPackages.wrapPython ]; + nativeBuildInputs = [ python2Packages.wrapPython ]; - buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ]; + buildInputs = [ python2Packages.pygtk python2Packages.psutil ]; - pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ]; + pythonPath = [ python2Packages.pygtk python2Packages.psutil ]; patchPhase = '' substituteInPlace install.sh --replace "/usr/local" "$out" diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 277230965884..f8f8b5b553ca 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -9,7 +9,7 @@ , proj_7 , perl532 , unscii -, python +, python2 , libGL , libGLU , xlibsWrapper @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "survex"; version = "1.2.44"; - nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ]; + nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python2 ]; buildInputs = [ libGL libGLU ffmpeg proj_7 diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 12edfe280be7..4c5c5e3a8406 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages, installShellFiles }: +{ lib, stdenv, fetchurl, python2Packages, installShellFiles }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles - pythonPackages.wrapPython + python2Packages.wrapPython ]; dontConfigure = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Upstream doesn't provide a setup.py or alike, so we follow: # http://fungi.yuggoth.org/weather/doc/install.rst#id3 installPhase = '' - site_packages=$out/${pythonPackages.python.sitePackages} + site_packages=$out/${python2Packages.python.sitePackages} install -Dt $out/bin -m 755 weather install -Dt $site_packages weather.py install -Dt $out/share/weather-util \ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index ef9ce5bca74c..f393a17c1bc6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pidgin, intltool, python } : +{ lib, stdenv, fetchurl, pidgin, intltool, python2 } : stdenv.mkDerivation rec { pname = "purple-plugin-pack"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; - buildInputs = [ pidgin intltool python ]; + buildInputs = [ pidgin intltool python2 ]; meta = with lib; { homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 8fece5412721..3278d68cd0b5 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }: +{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }: stdenv.mkDerivation rec { pname = "torchat"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = [ python wxPython wrapPython ]; - pythonPath = [ wxPython ]; + buildInputs = with python2.pkgs; [ python wxPython wrapPython ]; + pythonPath = with python2.pkgs; [ wxPython ]; preConfigure = "cd torchat/src; rm portable.txt"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/torchat cp -rf * $out/lib/torchat - makeWrapper ${python}/bin/python $out/bin/torchat \ + makeWrapper ${python2}/bin/python $out/bin/torchat \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ --run "cd $out/lib/torchat" \ --add-flags "-O $out/lib/torchat/torchat.py" diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 1d05cafef832..9c708b795885 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -13,7 +13,10 @@ let }; }; - boostPython = boost.override { enablePython = true; }; + boostPython = boost.override { + enablePython = true; + python = python2; + }; in stdenv.mkDerivation rec { pname = "twister"; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index efd438adf637..79dcab19acb4 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -2,7 +2,8 @@ , fetchFromGitHub, cmake , libusb-compat-0_1, pkg-config , usePython ? false -, python, ncurses, swig2 +, python ? null +, ncurses, swig2 , extraPackages ? [] } : diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index b2cefefb5cb5..efbedf9a121a 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: -pythonPackages.buildPythonPackage rec { +python2Packages.buildPythonPackage rec { pname = "poretools"; version = "unstable-2016-07-10"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; }; - propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas]; + propagatedBuildInputs = [python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas]; meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 911d0043ed26..3cb018b9a5db 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -6,7 +6,7 @@ # build , cmake , ctags -, pythonPackages +, python2Packages , swig # math , eigen @@ -36,7 +36,7 @@ , withSvmLight ? false }: -assert pythonSupport -> pythonPackages != null; +assert pythonSupport -> python2Packages != null; assert opencvSupport -> opencv != null; assert (!blas.isILP64) && (!lapack.isILP64); @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; nativeBuildInputs = [ cmake swig ctags ] - ++ (with pythonPackages; [ python jinja2 ply ]); + ++ (with python2Packages; [ python jinja2 ply ]); buildInputs = [ eigen @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nlopt lp_solve colpack - ] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ]) + ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ]) ++ lib.optional opencvSupport opencv; cmakeFlags = let diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index bbbe80eb6568..d12f9454ce7e 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchFromGitHub, gcc, python }: +{ lib, fetchFromGitHub, gcc, python2 }: let xhtml2pdf = import ./xhtml2pdf.nix { inherit lib; - fetchPypi = python.pkgs.fetchPypi; - buildPythonPackage = python.pkgs.buildPythonPackage; - html5lib = python.pkgs.html5lib; - httplib2 = python.pkgs.httplib2; - nose = python.pkgs.nose; - pillow = python.pkgs.pillow; - pypdf2 = python.pkgs.pypdf2; - reportlab = python.pkgs.reportlab; + fetchPypi = python2.pkgs.fetchPypi; + buildPythonPackage = python2.pkgs.buildPythonPackage; + html5lib = python2.pkgs.html5lib; + httplib2 = python2.pkgs.httplib2; + nose = python2.pkgs.nose; + pillow = python2.pkgs.pillow; + pypdf2 = python2.pkgs.pypdf2; + reportlab = python2.pkgs.reportlab; }; in -python.pkgs.buildPythonApplication rec { +python2.pkgs.buildPythonApplication rec { pname = "sasview"; version = "4.2.0"; - checkInputs = with python.pkgs; [ + checkInputs = with python2.pkgs; [ pytest unittest-xml-reporting ]; @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec { HOME=$(mktemp -d) py.test ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python2.pkgs; [ bumps gcc h5py diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 62d638717f80..1dfd47a3d381 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 -, cmake, makeWrapper, libjpeg, python }: +, cmake, makeWrapper, libjpeg, python2 }: let version = "5.2.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; }; - buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ]; + buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 33eba79732db..60d011b653d4 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; - buildInputs = [ wxGTK subversion apr aprutil python ]; + buildInputs = [ wxGTK subversion apr aprutil python2 ]; configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index cddcd3d8aa29..1735449e3fd5 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, rcs, git, makeWrapper }: +{ lib, stdenv, fetchurl, python2, rcs, git, makeWrapper }: stdenv.mkDerivation rec { pname = "src"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python rcs git ]; + buildInputs = [ python2 rcs git ]; preConfigure = '' patchShebangs . diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 11dbfc299a49..60260ee4de31 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2, curl }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake antlr2 ]; - buildInputs = [ libxml2 libxslt boost libarchive python curl ]; + buildInputs = [ libxml2 libxslt boost libarchive python2 curl ]; meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index d0c35ab7cbb1..6759e15ee833 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which +{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ libixp_hg txt2tags dash python which + buildInputs = [ libixp_hg txt2tags dash python2 which libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 68c6ea39cf7e..62d8f65ff8f6 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -16,7 +16,7 @@ , makeWrapper , numactl , perl -, python +, python2 , rocclr , rocm-comgr , rocm-device-libs @@ -56,7 +56,7 @@ let substituteInPlace bin/hip_embed_pch.sh \ --replace '$LLVM_DIR/bin/' "" - sed 's,#!/usr/bin/python,#!${python}/bin/python,' -i hip_prof_gen.py + sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \ @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE="; }; - nativeBuildInputs = [ cmake python makeWrapper perl ]; + nativeBuildInputs = [ cmake python2 makeWrapper perl ]; buildInputs = [ libxml2 numactl libglvnd libX11 ]; propagatedBuildInputs = [ clang diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index a1b59b8bf69d..51b1cfa11414 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll , sbcl, bash, which, perl, hostname -, openssl, glucose, minisat, abc-verifier, z3, python +, openssl, glucose, minisat, abc-verifier, z3, python2 , certifyBooks ? true } @ args: @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { which perl hostname makeWrapper # Some of the books require one or more of these external tools: openssl.out glucose minisat abc-verifier libipasir - z3 (python.withPackages (ps: [ ps.z3 ])) + z3 (python2.withPackages (ps: [ ps.z3 ])) ]; # NOTE: Parallel building can be memory-intensive depending on the number of diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index 7bd3913260d4..d8fa630c30df 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -8,7 +8,7 @@ , unzip , nodePackages , xcbuild -, python +, python2 , openssl , pkgs , fetchgit @@ -154,7 +154,7 @@ stdenv.mkDerivation { nodejs clojure jre - python + python2 openssl gnutar nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 675a7cdd6bc0..6022245cac73 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }: +{ rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w"; - nativeBuildInputs = [ python cmake clang ]; + nativeBuildInputs = [ python2 cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index c4a983d879ce..2b5e5a4addca 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -4,7 +4,7 @@ , pkg-config , gfortran , texinfo -, python +, python2 , boost # Select SIMD alignment width (in bytes) for vectorization. , simdWidth ? 1 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh"; }; - nativeBuildInputs = [ pkg-config python texinfo ]; + nativeBuildInputs = [ pkg-config python2 texinfo ]; buildInputs = [ gfortran texinfo boost ]; configureFlags = diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index eef6bbdd580f..033b9d8c6197 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: +{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }: stdenv.mkDerivation rec { pname = "ntrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkg-config python ]; + nativeBuildInputs = [ pkg-config python2 ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index 4f2f31d614c3..627d5bbe2978 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }: +{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }: stdenv.mkDerivation rec { pname = "openbabel"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib libxml2 eigen python cairo pcre ]; + buildInputs = [ zlib libxml2 eigen python2 cairo pcre ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index ed2f700dc82e..34dcd240838e 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip , zlib -, enablePython ? false, pythonPackages +, enablePython ? false, python2Packages , enableGtk2 ? false, gtk2 , enableJPEG ? true, libjpeg , enablePNG ? true, libpng @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] - ++ lib.optional enablePython pythonPackages.python + ++ lib.optional enablePython python2Packages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] ; - propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; + propagatedBuildInputs = lib.optional enablePython python2Packages.numpy; nativeBuildInputs = [ cmake pkg-config unzip ]; diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/development/libraries/pcmsolver/default.nix index 8cd4b318cc5a..dd94a4a088cb 100644 --- a/pkgs/development/libraries/pcmsolver/default.nix +++ b/pkgs/development/libraries/pcmsolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python +{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2 , boost, eigen, zlib } : @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmake gfortran perl - python + python2 ]; buildInputs = [ diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 65fb04b707ab..5c3bc936e8c1 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, python +, python ? null , withPython ? false }: diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index d0bdb95fecc2..561c9cf93c2c 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, python2, cmake, pkg-config }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec outputs = [ "bin" "dev" "out" "lib" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python pkg-config ]; + buildInputs = [ zlib python2 pkg-config ]; # Can be removed in the next release # https://github.com/wdas/ptex/pull/42 diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 96e4a42ad09e..7cd3a086cdb8 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }: +{ fetchurl, lib, stdenv, ant, jdk, jre, python2, makeWrapper }: stdenv.mkDerivation rec { pname = "rabbitmq-java-client"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ant jdk python ]; + buildInputs = [ ant jdk python2 ]; buildPhase = "ant dist"; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 8c97d0224c66..1c876cf36360 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -1,6 +1,6 @@ -# alsa-lib vorbis-tools python can be made optional +# alsa-lib vorbis-tools python2 can be made optional -{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: +{ lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: stdenv.mkDerivation rec { pname = "snack"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postUnpack = ''sourceRoot="$sourceRoot/unix"''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ]; + buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 2325c043d014..ef30c5916eab 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, python +, python2 , libidn , lua , miniupnpc @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python + python2 libidn lua miniupnpc diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 3357b99cebfc..264d95f39f67 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python, cmake, libllvm, ocaml, findlib, ctypes }: +{ stdenv, lib, python2, cmake, libllvm, ocaml, findlib, ctypes }: let version = lib.getVersion libllvm; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit (libllvm) src; nativeBuildInputs = [ cmake ]; - buildInputs = [ python ocaml findlib ctypes ]; + buildInputs = [ python2 ocaml findlib ctypes ]; propagatedBuildInputs = [ libllvm ]; cmakeFlags = [ diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index bee8a6106ea1..c19b40eb9afe 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make }: +{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }: # This is the original pycaml version with patches from debian. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sourceRoot = "pycaml"; patches = [ "../debian/patches/*.patch" ]; - buildInputs = [ ncurses ocaml findlib python ocaml_make ]; + buildInputs = [ ncurses ocaml findlib python2 ocaml_make ]; createFindlibDestdir = true; # the Makefile is not shipped with an install target, hence we do it ourselves. diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index 72154e909b65..edad1f0dd9ee 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python2 }: stdenv.mkDerivation rec { pname = "oclgrind"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python ]; + buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python2 ]; cmakeFlags = [ "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}" diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 1f7c6641b1cc..6b238fb9266e 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }: +{ lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }: let name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = kcachegrind.src; - buildInputs = [ qtbase perl python php ]; + buildInputs = [ qtbase perl python2 php ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index 930078b2dc72..220554f95d90 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -1,7 +1,7 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage rec { + pgdbconn = python2Packages.buildPythonPackage rec { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { @@ -13,13 +13,13 @@ let # The tests are impure (they try to access a PostgreSQL server) doCheck = false; propagatedBuildInputs = [ - pythonPackages.psycopg2 - pythonPackages.pytest + python2Packages.psycopg2 + python2Packages.pytest ]; }; in -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { pname = "pyrseas"; version = "0.8.0"; src = fetchFromGitHub { @@ -31,9 +31,9 @@ pythonPackages.buildPythonApplication { # The tests are impure (they try to access a PostgreSQL server) doCheck = false; propagatedBuildInputs = [ - pythonPackages.psycopg2 - pythonPackages.pytest - pythonPackages.pyyaml + python2Packages.psycopg2 + python2Packages.pytest + python2Packages.pyyaml pgdbconn ]; meta = { diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 759c83e81c8a..64d299db155b 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python2 ]; meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 448e7dd4406e..d9e4ec1fb199 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg -, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase +, libpng, perl, python2, ruby, sqlite, qtwebkit, qmake, qtbase , darwin, writeScriptBin, cups, makeWrapper }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ bison flex fontconfig freetype gperf icu openssl - libjpeg libpng perl python ruby sqlite qtwebkit qtbase + libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase makeWrapper ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ApplicationServices AppKit Cocoa OpenGL diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix index 1885d1a43223..dd4ad058c8da 100644 --- a/pkgs/development/tools/udis86/default.nix +++ b/pkgs/development/tools/udis86/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }: stdenv.mkDerivation rec { pname = "udis86"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1"; }; - nativeBuildInputs = [ autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook python2 ]; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 352dc83f9abd..58fef12cd6e8 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages, makeDesktopItem }: +{ lib, fetchurl, python2Packages, makeDesktopItem }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "winpdb"; version = "1.4.8"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; }; - propagatedBuildInputs = [ pythonPackages.wxPython ]; + propagatedBuildInputs = [ python2Packages.wxPython ]; desktopItem = makeDesktopItem { name = "winpdb"; diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index 41c903e10116..01bd44ee244a 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -2,7 +2,7 @@ and out-of-tree mod packages (mod.nix). */ { lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper -, lua, mono, dotnetPackages, python +, lua, mono, dotnetPackages, python2 , libGL, freetype, openal, SDL2 , zenity }: @@ -10,7 +10,7 @@ with lib; let - path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity); + path = makeBinPath ([ mono python2 ] ++ optional (zenity != null) zenity); rpath = makeLibraryPath [ lua freetype openal SDL2 ]; mkdirp = makeSetupHook { } ./mkdirp.sh; @@ -66,7 +66,7 @@ in { makeWrapper mkdirp mono - python + python2 ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index f81ddb7edf95..809ed7a146d0 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } : +{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } : stdenv.mkDerivation rec { pname = "tennix"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; }; - buildInputs = [ python SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; + buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; patches = [ ./fix_FTBFS.patch ]; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 558b5ca63377..dc1a23f33b39 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config -, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell +, python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; }; - nativeBuildInputs = [ cmake makeWrapper pkg-config python ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ]; buildInputs = [ glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 3b24584f7e63..c09a83b92ea8 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL +{ lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL , wafHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wafHook ]; - buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ]; + buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ]; preConfigure = '' tar xf ${mupen64plus.src} diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 6908429e21b9..ffb9d0da8570 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }: +{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { pname = "xtrlock-pam"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python xlibsWrapper pam ]; + buildInputs = [ python2 xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 1f210717c0bc..7d8dc0a30993 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -10,7 +10,7 @@ , substituteAll # Language dependencies -, python +, python2 , python3 , rustPlatform @@ -184,7 +184,7 @@ self: super: { }); ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: { - buildInputs = [ python ]; + buildInputs = [ python2 ]; buildPhase = '' patchShebangs . ./install.sh @@ -862,7 +862,7 @@ self: super: { vim-isort = super.vim-isort.overrideAttrs (old: { postPatch = '' substituteInPlace ftplugin/python_vimisort.vim \ - --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")' + --replace 'import vim' 'import vim; import sys; sys.path.append("${python2.pkgs.isort}/${python2.sitePackages}")' ''; }); @@ -916,7 +916,7 @@ self: super: { }); vim-wakatime = super.vim-wakatime.overrideAttrs (old: { - buildInputs = [ python ]; + buildInputs = [ python2 ]; }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 8411c4fdbfaf..0091accd57a7 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }: +{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, python2Packages, writeScript, runtimeShell }: let @@ -29,7 +29,7 @@ let pmountBin = useSetUID pmount "/bin/pmount"; pumountBin = useSetUID pmount "/bin/pumount"; - inherit (pythonPackages) python dbus-python; + inherit (python2Packages) python dbus-python; in stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index 92294b58e42a..ba525c1a387a 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, wafHook }: +{ lib, stdenv, fetchFromGitHub, python2, wafHook }: stdenv.mkDerivation rec { pname = "pflask"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wafHook ]; - buildInputs = [ python ]; + buildInputs = [ python2 ]; meta = { description = "Lightweight process containers for Linux"; diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index cace3e22ae7d..b2636382aec6 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "smem"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; - buildInputs = [ python ]; + buildInputs = [ python2 ]; makeFlags = [ "smemcap" ]; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index 2801334688b0..2802fddf8ce5 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "speedometer"; version = "2.8"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm"; }; - propagatedBuildInputs = [ pythonPackages.urwid ]; + propagatedBuildInputs = [ python2Packages.urwid ]; postPatch = '' sed -i "/'entry_points': {/d" setup.py diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index dbda35670f66..e842b59651e7 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pciutils, python}: +{lib, stdenv, fetchurl, pciutils, python2}: stdenv.mkDerivation rec { version = "1.30"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i 's/-Werror -Wall//' Makefile ''; - buildInputs = [ pciutils python ]; + buildInputs = [ pciutils python2 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index a8b837c8b3e7..a5b36ad5c4ac 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -3,7 +3,7 @@ , fetchurl , erlang , elixir -, python +, python2 , libxml2 , libxslt , xmlto @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; - buildInputs = [ erlang elixir python libxml2 libxslt glibcLocales ] + buildInputs = [ erlang elixir python2 libxml2 libxslt glibcLocales ] ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 146db2ea5de5..cf6427c860cf 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, zip, unzip -, jdk, python +, jdk, python2 , confFile ? "" , extraLibraryPaths ? [] , extraJars ? [] @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { fixupPhase = '' # Fix python reference sed -i \ - -e '19iPYTHON=${python}/bin/python' \ - -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \ + -e '19iPYTHON=${python2}/bin/python' \ + -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \ $out/bin/storm sed -i \ - -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \ + -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \ -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \ -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \ $out/bin/storm.py diff --git a/pkgs/servers/mapserver/default.nix b/pkgs/servers/mapserver/default.nix index 4735264f0a97..f8b0d8196fad 100644 --- a/pkgs/servers/mapserver/default.nix +++ b/pkgs/servers/mapserver/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz , libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib -, withPython ? true, swig, python +, withPython ? true, swig, python2 }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { proj protobufc zlib - ] ++ lib.optional withPython python; + ] ++ lib.optional withPython python2; cmakeFlags = [ "-DWITH_KML=ON" diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index 078ebfb7b6e4..142dfe29fa22 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -25,7 +25,7 @@ , pcre , perl , prometheus-cpp -, python +, python2 , re2 , zlib }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { cmake libtool perl - python + python2 ]; buildInputs = [ diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 6c853b1ccc8b..64e8d423d91b 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config -, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2 , v4l-utils, which, zlib }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation { }; buildInputs = [ - avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python + avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2 which zlib ]; diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix index 7fb2d7861937..6af5fe7cc66c 100644 --- a/pkgs/shells/zsh/zsh-git-prompt/default.nix +++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix @@ -25,7 +25,7 @@ # installed. # { fetchFromGitHub -, python +, python2 , git , lib , haskellPackages @@ -45,7 +45,7 @@ haskellPackages.callPackage prePatch = '' substituteInPlace zshrc.sh \ --replace ':-"python"' ':-"haskell"' \ - --replace 'python ' '${python.interpreter} ' \ + --replace 'python ' '${python2.interpreter} ' \ --replace 'git ' '${git}/bin/git ' ''; preCompileBuildDriver = "cd src"; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 9c49c4677d2a..5825f8b25eeb 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python +{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2 , lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { version = "1.5.1.81"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which attr python ]; + buildInputs = [ which attr python2 ]; patches = [ (fetchpatch { diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index edb94891fbe9..13f3c42faa46 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake +{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k"; }; - nativeBuildInputs = [ autogen flex bison python autoconf automake ]; + nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index bc7baa55fecd..bffcd5e1dca4 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python, git +, python2, git }: let jdk = jdk8; jre = jdk8.jre; in @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ autoconf automake curl jdk nettools python git ]; + buildInputs = [ autoconf automake curl jdk nettools python2 git ]; preConfigure = '' patchShebangs ./build-aux/ diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index bfc2ce2c0e99..4dd19a7f397a 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -29,7 +29,7 @@ , bubblewrap , pcre , check -, python +, python2 , json_c , zchunk , libmodulemd @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { librepo pcre check - python + python2 # libdnf # vendored unstable branch # required by vendored libdnf diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 37361abf2b2f..80d9e191c8a6 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, util-linux, json_c, nixosTests +, lvm2, pam, python2, util-linux, json_c, nixosTests , ncurses }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 - lvm2 pam python util-linux json_c ncurses + lvm2 pam python2 util-linux json_c ncurses ]; passthru.tests.snapper = nixosTests.snapper; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index e112b8c1df12..3c6eff4d601c 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , pkg-config, makeWrapper, autoreconfHook -, openldap, python, pam +, openldap, python2, pam }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; - buildInputs = [ openldap pam python ]; + buildInputs = [ openldap pam python2 ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 60bd2f8cc7e8..dc447f3a86b9 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { pname = "philter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/{bin,share/philter} cp .philterrc "$out"/share/philter/philterrc - sed -i 's@/usr/local/bin@${python}/bin@' src/philter.py + sed -i 's@/usr/local/bin@${python2}/bin@' src/philter.py cp src/philter.py "$out"/bin/philter chmod +x "$out"/bin/philter ''; diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index a17701644c87..1d7d006f537a 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }: +{ lib, fetchFromGitHub, python2Packages, openssh, rsync }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "pssh"; version = "2.3.1"; diff --git a/pkgs/tools/networking/py-wmi-client/default.nix b/pkgs/tools/networking/py-wmi-client/default.nix index 7a2774002891..8f5958193db8 100644 --- a/pkgs/tools/networking/py-wmi-client/default.nix +++ b/pkgs/tools/networking/py-wmi-client/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "py-wmi-client"; version = "unstable-20160601"; @@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d"; }; - propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ]; + propagatedBuildInputs = with python2Packages; [ impacket natsort pyasn1 pycrypto ]; # no tests doCheck = false; diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index 7c3d23c0d17f..7a26ffdeb436 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python, libev, wafHook }: +{ lib, stdenv, fetchgit, python2, libev, wafHook }: stdenv.mkDerivation rec { pname = "weighttp"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wafHook ]; - buildInputs = [ python libev ]; + buildInputs = [ python2 libev ]; meta = with lib; { description = "Lightweight and simple webserver benchmarking tool"; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 4abbbd2d1d1f..9c73f8a00195 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib, fetchFromGitHub, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "volatility"; version = "2.6.1"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; - propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ]; + propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ]; meta = with lib; { homepage = "https://www.volatilityfoundation.org/"; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 6438a545a485..de8948db6c91 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -31,7 +31,7 @@ , perl , postgresql , protobufc -, python +, python2 , rabbitmq-c , rdkafka , riemann_c_client @@ -102,7 +102,7 @@ let pinba.buildInputs = [ protobufc ]; ping.buildInputs = [ liboping ]; postgresql.buildInputs = [ postgresql ]; - python.buildInputs = [ python ]; + python.buildInputs = [ python2 ]; redis.buildInputs = [ hiredis ]; rrdcached.buildInputs = [ rrdtool libxml2 ]; rrdtool.buildInputs = [ rrdtool libxml2 ]; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 1752aba240f3..073a0921f98e 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,9 +1,9 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python2Packages, fetchFromGitHub }: let version = "3.13"; pname = "ps_mem"; -in pythonPackages.buildPythonApplication { +in python2Packages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 0f8db091d616..affb4bca6cec 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng -, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq +, eventlog, perl, python2, bison, protobufc, libivykis, libcap, czmq }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook bison ]; buildInputs = [ - glib syslogng eventlog perl python protobufc libivykis libcap czmq + glib syslogng eventlog perl python2 protobufc libivykis libcap czmq ]; configureFlags = [ diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 51f8cd94da1e..d0a22203aa9c 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libcap, curl, which -, eventlog, pkg-config, glib, python, systemd, perl +, eventlog, pkg-config, glib, python2, systemd, perl , riemann_c_client, protobufc, pcre, libnet , json_c, libuuid, libivykis, mongoc, rabbitmq-c , libesmtp @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { eventlog glib perl - python + python2 systemd riemann_c_client protobufc diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index cbb055323a68..5ad14295e872 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python }: +{ lib, stdenv, fetchFromGitHub, cmake, python2 }: stdenv.mkDerivation rec { pname = "opencc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI="; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python2 ]; # let intermediate tools find intermediate library preBuild = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index eb299caade9c..9f237066d7c1 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { version = "2.6"; @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { dontBuild = true; # Python script, needs the interpreter - propagatedBuildInputs = [ python ]; + propagatedBuildInputs = [ python2 ]; installPhase = '' mkdir -p "$out/bin" mkdir -p "$out/share/doc" mkdir -p "$out/share/man/man1/" - sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags" + sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags" chmod +x "$out/bin/txt2tags" gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz" cp doc/userguide.pdf "$out/share/doc" diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 85dcece956fb..252167fcea97 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pythonPackages, libreoffice }: +{ lib, fetchFromGitHub, python2Packages, libreoffice }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "odpdown"; version = "0.4.1"; @@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4="; }; - propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ]; + propagatedBuildInputs = with python2Packages; [ libreoffice lpod lxml mistune pillow pygments ]; - checkInputs = with pythonPackages; [ + checkInputs = with python2Packages; [ nose ]; diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index fdaf2ee27466..f32078f0b8a0 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchurl, pythonPackages }: +{ lib, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "vnc2flv"; version = "20100207"; diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index ab3c9b1e71cd..2497cc6a9df0 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }: +{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python2, gnutar, gnused, gnugrep, which }: stdenv.mkDerivation (rec { pname = "xe-guest-utilities"; @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794"; }; - buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ]; + buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz stdenv gnugrep which ]; patches = [ ./ip-address.patch ]; postPatch = '' tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b90cbf2b7e1..e894bed7d388 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -817,8 +817,11 @@ mapAliases ({ pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01 + python = python2; # added 2022-01-11 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08 python-swiftclient = swiftclient; # added 2021-09-09 + pythonFull = python2Full; # added 2022-01-11 + pythonPackages = python.pkgs; # added 2022-01-11 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e73d300fd21a..3ade9523149a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4660,7 +4660,7 @@ with pkgs; diffutils = callPackage ../tools/text/diffutils { }; dir2opus = callPackage ../tools/audio/dir2opus { - inherit (pythonPackages) mutagen python wrapPython; + inherit (python2Packages) mutagen python wrapPython; }; dirdiff = callPackage ../tools/text/dirdiff { @@ -10696,7 +10696,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; - wakatime = pythonPackages.callPackage ../tools/misc/wakatime { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; weather = callPackage ../applications/misc/weather { }; @@ -13652,7 +13652,6 @@ with pkgs; # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md - python = python2; python2 = python27; python3 = python39; pypy = pypy2; @@ -13661,11 +13660,6 @@ with pkgs; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - pythonFull = python.override { - self = pythonFull; - pythonAttr = "pythonFull"; - x11Support = true; - }; python2Full = python2.override { self = python2Full; pythonAttr = "python2Full"; @@ -13702,7 +13696,6 @@ with pkgs; }; # pythonPackages further below, but assigned here because they need to be in sync - pythonPackages = python.pkgs; python2Packages = python2.pkgs; python3Packages = python3.pkgs; @@ -21685,7 +21678,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; - inherit (pythonPackages) buildPythonPackage qpid-python; + inherit (python2Packages) buildPythonPackage qpid-python; }; qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; @@ -29017,9 +29010,7 @@ with pkgs; topydo = callPackage ../applications/misc/topydo {}; - torchat = callPackage ../applications/networking/instant-messengers/torchat { - inherit (pythonPackages) wrapPython wxPython; - }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { }; torrential = callPackage ../applications/networking/p2p/torrential { }; @@ -31701,7 +31692,7 @@ with pkgs; useMpi = true; }); - neuron-full = neuron-mpi.override { inherit python; }; + neuron-full = neuron-mpi.override { python = python2; }; mrbayes = callPackage ../applications/science/biology/mrbayes { }; @@ -33204,7 +33195,7 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script {}; - nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; + nix-template-rpm = callPackage ../build-support/templaterpm { inherit (python2Packages) python toposort; }; nix-top = callPackage ../tools/package-management/nix-top { }; @@ -33255,7 +33246,7 @@ with pkgs; disnix = callPackage ../tools/package-management/disnix { }; dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { - inherit (pythonPackages) supervisor; + inherit (python2Packages) supervisor; }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eef542e8defe..c653a54a9fc5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2746,14 +2746,14 @@ in { fastjet = toPythonModule (pkgs.fastjet.override { withPython = true; - inherit python; + inherit (self) python; }); fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { withPython = true; - inherit python; + inherit (self) python; }); fastnumbers = callPackage ../development/python-modules/fastnumbers { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 13526349dfc5..62d2d5ed8c18 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -54,7 +54,7 @@ let jobs.openssl.x86_64-darwin jobs.pandoc.x86_64-darwin jobs.postgresql.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.ruby.x86_64-darwin jobs.rustc.x86_64-darwin @@ -99,7 +99,7 @@ let jobs.go.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux - jobs.python.x86_64-linux + jobs.python2.x86_64-linux jobs.python3.x86_64-linux # Needed by contributors to test PRs (by inclusion of the PR template) jobs.nixpkgs-review.x86_64-linux @@ -134,7 +134,7 @@ let jobs.stdenv.x86_64-darwin jobs.cargo.x86_64-darwin jobs.go.x86_64-darwin - jobs.python.x86_64-darwin + jobs.python2.x86_64-darwin jobs.python3.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin jobs.nix-info.x86_64-darwin From 60c7aeb9af0f24035823d523eb72c1d05d755bfa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jan 2022 23:51:59 +0100 Subject: [PATCH 18/33] python3Packages.meshtastic: 1.2.56 -> 1.2.57 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 0cfcfa119da4..d146d7d64564 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.56"; + version = "1.2.57"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-y+LX44tjE/zTwm1FNyLACu3wmkxN4ZsmYlOnfJdcFcQ="; + sha256 = "sha256-olh8DUYg3s72ll1+p+0QapdKR2+aaSvgSUrZuGFif1s="; }; propagatedBuildInputs = [ From ff402748b330773e91a9c66166a080afee7211d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Jan 2022 02:07:27 +0100 Subject: [PATCH 19/33] yle-dl: 20210917 -> 20211213 --- pkgs/tools/misc/yle-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 31d5712e5b33..9f974c6751bb 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yle-dl"; - version = "20210917"; + version = "20211213"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "sha256-l8Wv15DLWRvJ+I6KeTNbIjp+S5EgoqhLOWd0wEyXckk="; + sha256 = "sha256-U7ydZ6nSVtMv9mxNSWT/IICwbjK3PCBKxfqjrQ9jwW0="; }; propagatedBuildInputs = with python3Packages; [ From 0fbc9cb65354847b59feb9f541a1982cde2bdae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Jan 2022 02:17:27 +0100 Subject: [PATCH 20/33] python39Packages.google-cloud-tasks: 2.7.1 -> 2.7.2 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index e055d462b1f3..c1b58c0e1c26 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "2fd2222901a7d8ba65f28f9019cb41f5d4c952d012f020bdde105527a3f5ae43"; + sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; From 43d9f800f7e293b848d219d1554cc45ebe237b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Jan 2022 02:19:06 +0100 Subject: [PATCH 21/33] python39Packages.google-cloud-datacatalog: 3.6.1 -> 3.6.2 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 0e0d5982c6e2..bf9e8552aec1 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d"; + sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE="; }; propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; From cd330a1666a1d5e4aa6465fb188f4456bda6daee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Jan 2022 02:19:56 +0100 Subject: [PATCH 22/33] python39Packages.google-cloud-bigquery: 2.31.0 -> 2.32.0 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index d8cd4d3b5800..96a10e1a2221 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.31.0"; + version = "2.32.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ff66d7d1f64795a855784706c3baa52d18fa0cd1cc4f0a150cf74268abb53ac0"; + sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70="; }; propagatedBuildInputs = [ From 32c8a5de6668843c2746e0d52d00d15eebca1012 Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com> Date: Sat, 15 Jan 2022 20:00:12 +0200 Subject: [PATCH 23/33] nixos/chromium: Add DefaultSearchProviderEnabled option Without this option `DefaultSearchProviderSearchURL` and `DefaultSearchProviderSuggestURL` are really wastefull as it does not set search engine, at least for me. Co-authored-by: Sandro --- nixos/modules/programs/chromium.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 602253a321d7..8a1653318ab5 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -7,6 +7,7 @@ let defaultProfile = filterAttrs (k: v: v != null) { HomepageLocation = cfg.homepageLocation; + DefaultSearchProviderEnabled = cfg.defaultSearchProviderEnabled; DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL; DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL; ExtensionInstallForcelist = cfg.extensions; @@ -50,6 +51,13 @@ in example = "https://nixos.org"; }; + defaultSearchProviderEnabled = mkOption { + type = types.nullOr types.bool; + description = "Enable the default search provider."; + default = null; + example = true; + }; + defaultSearchProviderSearchURL = mkOption { type = types.nullOr types.str; description = "Chromium default search provider url."; From 6e4afa39a5952a5d834cbe2d5d7f03a469b8d1c9 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Jan 2022 08:07:49 +0100 Subject: [PATCH 24/33] php: 7.4.26 -> 7.4.27 --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 1cc63d7b58a4..316b37f2e099 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.26"; - sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn"; + version = "7.4.27"; + sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563"; }); in From 5fc1a37f1be2f8b1b50125926fe1d1bf6ecb1377 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 17 Jan 2022 08:08:09 +0100 Subject: [PATCH 25/33] php: 8.0.13 -> 8.0.14 --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 8cf7d4ebc8df..b34f5974ff4e 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.13"; - sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2"; + version = "8.0.14"; + sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v"; }); in From 4fa7c297f2b0cc61fc0ff927a70cce7c294795ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Jan 2022 23:49:35 -0800 Subject: [PATCH 26/33] minimap2: 2.23 -> 2.24 * minimap2: 2.23 -> 2.24 (#153189) * minimap2: no support for aarch64 Co-authored-by: Renaud --- pkgs/applications/science/biology/minimap2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index 062cdd56c7c4..bba8a02b76e3 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "sha256-oNVpSINcXO2eKzOCr/Fl8tSMguRxzmlDNu7hLZeopoQ="; + sha256 = "sha256-sEp7/Y5ifV9LTqrkhlkfykTJYMMuc+VtF7PvmIpBxUw="; }; buildInputs = [ zlib ]; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; + badPlatforms = platforms.aarch64; maintainers = [ maintainers.arcadio ]; }; } From 31dda65403b5a81ad90baaa7b2aafd4645319517 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 17 Jan 2022 09:19:17 +0100 Subject: [PATCH 27/33] vscode-extensions.stkb.rewrap: 1.15.4 -> 1.16.0 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 954af1706fe8..141fef09d453 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1574,8 +1574,8 @@ let mktplcRef = { publisher = "stkb"; name = "rewrap"; - version = "1.15.4"; - sha256 = "sha256-yuXyClvhGsonvddYHDMkLSvwEsD21vOeE54Gs9BRpeg="; + version = "1.16.0"; + sha256 = "sha256-351zYmMupAv/8fQ+lOc0pYzy/wsE3JqTuxfKD+AdBAc="; }; meta = with lib; { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; From e8242572da91a5609e88a49899214ee6ca6b18bc Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 17 Jan 2022 10:12:23 +0100 Subject: [PATCH 28/33] vscode-extensions.streetsidesoftware.code-spell-checker: 2.0.14 -> 2.1.4 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 954af1706fe8..b52ca896754c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1591,8 +1591,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.0.14"; - sha256 = "sha256-mwcssQvaztrnUuSoo8AWK3FXT4qKmPTRCGVYkAjgfXg="; + version = "2.1.4"; + sha256 = "sha256-V8ug/EtDczjiofuL7HhpN1B+qbedpnvIlXnwiXJzD/g="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From 2eaa8d8bbf83c64ea6b744078b8637476808052a Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Mon, 17 Jan 2022 01:55:09 -0700 Subject: [PATCH 29/33] vscode: add non-english language packs --- pkgs/misc/vscode-extensions/default.nix | 2 + .../misc/vscode-extensions/language-packs.nix | 89 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 pkgs/misc/vscode-extensions/language-packs.nix diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 954af1706fe8..62133f6e30d4 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1250,6 +1250,8 @@ let }; }; + ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs + ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { }; ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { diff --git a/pkgs/misc/vscode-extensions/language-packs.nix b/pkgs/misc/vscode-extensions/language-packs.nix new file mode 100644 index 000000000000..f97727d6c2cb --- /dev/null +++ b/pkgs/misc/vscode-extensions/language-packs.nix @@ -0,0 +1,89 @@ +{ lib, vscode-utils }: + +with vscode-utils; + +let + + buildVscodeLanguagePack = { language, sha256 }: + buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-language-pack-${language}"; + publisher = "MS-CEINTL"; + version = "1.64.3"; + inherit sha256; + }; + meta = { + license = lib.licenses.mit; + }; + }; + +in + +# See list of core language packs at https://github.com/Microsoft/vscode-loc +{ + # French + vscode-language-pack-fr = buildVscodeLanguagePack { + language = "fr"; + sha256 = "sha256-6ynT1sbMgKO8iZReQ6KxFpR1VL3Nuo58MvXCtp+67vA="; + }; + # Italian + vscode-language-pack-it = buildVscodeLanguagePack { + language = "it"; + sha256 = "sha256-5aNFpzNMZAZJH3n0rJevke9P6AW0au5i8+r4PXsb9Rg="; + }; + # German + vscode-language-pack-de = buildVscodeLanguagePack { + language = "de"; + sha256 = "sha256-oEaWtsgktHKw52lnZTESkpzC/TTY8LO4yX11IgtMG5U="; + }; + # Spanish + vscode-language-pack-es = buildVscodeLanguagePack { + language = "es"; + sha256 = "sha256-utLWbved3WCCk3XzqedbYzmyaKfbMrAmR0btT09GlxA="; + }; + # Russian + vscode-language-pack-ru = buildVscodeLanguagePack { + language = "ru"; + sha256 = "sha256-0Wr2ICOiaaj4jZ555bxUJcmXO/yWDyn0UmdvxUF3WSQ="; + }; + # Chinese (Simplified) + vscode-language-pack-zh-hans = buildVscodeLanguagePack { + language = "zh-hans"; + sha256 = "sha256-irTSQcVXf/V3MuZwfx4tFcvBk+xhbFZTnb7IG28s/p4="; + }; + # Chinese (Traditional) + vscode-language-pack-zh-hant = buildVscodeLanguagePack { + language = "zh-hant"; + sha256 = "sha256-3IA/VTTTEqS6jrDYv50GnLXOTSC1XAMvqOVfOuvIdIs="; + }; + # Japanese + vscode-language-pack-ja = buildVscodeLanguagePack { + language = "ja"; + sha256 = "sha256-rxod70ddrppEYYzukksVY1dTXR8osLFAsIPr1fSFZDg="; + }; + # Korean + vscode-language-pack-ko = buildVscodeLanguagePack { + language = "ko"; + sha256 = "sha256-QYFaxJz1PqKKIiLosLQ8Tu3JNXzpxLFqgIHjjRLwjA4="; + }; + # Czech + vscode-language-pack-cs = buildVscodeLanguagePack { + language = "cs"; + sha256 = "sha256-eMk+syy2h+Xb3k6QB8PqYaF4I1ydaY6eRsvOXmelh9Q="; + }; + # Portuguese (Brazil) + vscode-language-pack-pt-br = buildVscodeLanguagePack { + language = "pt-BR"; + sha256 = "sha256-7Trz38KBl4sD7608MvTs02pUsdD05oHEj3Sp1LvtI7I="; + }; + # Turkish + vscode-language-pack-tr = buildVscodeLanguagePack { + language = "tr"; + sha256 = "sha256-T4CTpbve3vrNdW4VDfHDg8U8cQEtuxPV5LvNdtKrqzA"; + }; + # Pseudo Language + vscode-language-pack-qps-ploc = buildVscodeLanguagePack { + language = "qps-ploc"; + sha256 = "sha256-rPvCr3uQPfM8vwKoV7Un5aiMZClhf6TvG1PEe3xYNI0="; + }; +} From 1e75a13d8eae78fd0f7f770fff896b3257b626b9 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 17 Jan 2022 09:21:47 +0000 Subject: [PATCH 30/33] deno: 1.17.2 -> 1.17.3 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 32507f0d5a38..a0c724c1d353 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg="; + sha256 = "sha256-S4Dt6SrSE/TLGhjAkTrIdvNR71A6ykxSxq72aiyWUX8="; }; - cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8="; + cargoSha256 = "1ph392jxkln2ihq3x4hhjb1k3fsd2g54m37qgqkza4abvmc7adns"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 5883bf6728630047b0b0cb07d8fb6e03c24a0593 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 04:12:34 +0000 Subject: [PATCH 31/33] terraform-providers: update 2022-01-17 --- .../terraform-providers/providers.json | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 55b285a1b288..a9e0e1afa49e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -21,10 +21,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.4.0", - "sha256": "0m43d2iaa9kywzvlgcnsya1ma9k570j9q8cq9l6ldpc8565fqq0i", - "vendorSha256": "1lpfnpg4sivy8vilkxamdn1hyn6k61lxsfcq67afxsq8pcy6q44v", - "version": "2.4.0" + "rev": "v2.5.0", + "sha256": "1x37bnykn28hmb80qi530zgk6jfqpk97nswrm0hdw8x5vac4v63a", + "vendorSha256": "0ldk06dj72551b6djsq7vil0hzfsp3ixwh3ikqb40shsdq10iplx", + "version": "2.5.0" }, "akamai": { "owner": "akamai", @@ -40,10 +40,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.151.0", - "sha256": "0pdvbq9kfq7vwkfk75fjy6jaiq5bfkjmvr3z07712b76z29m10bz", + "rev": "v1.152.0", + "sha256": "1childp3dkdi6raya1865inkky2qx1jav95yq9c57gz20zs27x8a", "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", - "version": "1.151.0" + "version": "1.152.0" }, "ansible": { "owner": "nbering", @@ -94,28 +94,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.71.0", - "sha256": "0jr9mk6gvimh8picpcc47pcan323k4rml438743ma53g8jhcvn2a", - "vendorSha256": "02ax2717xci8qia3k7q19yknazn67idb64hf5mwahfnx1fjmdc22", - "version": "3.71.0" + "rev": "v3.72.0", + "sha256": "0xkwqh7akc7rf047w6by4368n2bpn4lijk9j6j3wsgbaffw0xjlb", + "vendorSha256": "0apvp3vb3qx2l6698x4ai3spz40l6mb3z8gn45ms2vlxcwp2wf7y", + "version": "3.72.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.14.0", - "sha256": "0sjpwhywc165gkxd1ybkwi1aww4xivry82wh0mbh4bgs607mn8lg", + "rev": "v2.15.0", + "sha256": "1gjx91svfg25x0hlx6mfam40615x278b9vxsy5p88s3dl6xs3hdv", "vendorSha256": null, - "version": "2.14.0" + "version": "2.15.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.91.0", - "sha256": "0db23ch46wi5mjmwibp7n98y0j3cl06mq2pzmvw1scbzvgh0gcqp", + "rev": "v2.92.0", + "sha256": "0p4vxda4n7895xp7aqg4zqddynjn7hnzsc8am83y8hf9hbfaji8q", "vendorSha256": null, - "version": "2.91.0" + "version": "2.92.0" }, "azurestack": { "owner": "hashicorp", @@ -185,10 +185,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.6.0", - "sha256": "1adpzk9vjllr18dq8kggxfabm3ax59m55ls98mkqh8lmgq96bh7d", - "vendorSha256": "1rdgjb1gfz5fs6s3c15nj92rm8ifb23n25wpxl16mz4aifkjgqam", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "1d1wljk033b9j5sx01xjv5jmclw79f2f21s8zsix036mmzvaiswb", + "vendorSha256": "1g3fyxrdqa4ds6n9pcw2mvi8nfiz4dna57ssvggfwic4jl89q7zm", + "version": "3.7.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -266,10 +266,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.16.0", - "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", + "rev": "v2.17.0", + "sha256": "0in6xg4kgqy1izi8zapdi0f6dsni3i27fxh1l4sqp5kwh3vgpn0d", "vendorSha256": null, - "version": "2.16.0" + "version": "2.17.0" }, "dme": { "owner": "DNSMadeEasy", @@ -347,10 +347,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.39.0", - "sha256": "0sjjcz2z7qr1dmm6zzyi382cas4k5vdg0q7yxlpcqxqqrql636k8", + "rev": "v0.40.0", + "sha256": "11gf1xmj0qgn3hfw4hviqnfc23rrfd3qxz82idff4f1i7c5kym1i", "vendorSha256": null, - "version": "0.39.0" + "version": "0.40.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -393,29 +393,29 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.5.0", - "sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px", + "rev": "v4.6.0", + "sha256": "0vi0crc4i5myzw17knvb3zz0yjpg7v1qvp9rjrb0q6v89nafr30c", "vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la", - "version": "4.5.0" + "version": "4.6.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.5.0", - "sha256": "17z2jy8b9gk0id8q0318a6k60fhcqps0p36s7d7kkqmr44shgzs4", + "rev": "v4.6.0", + "sha256": "0kbdpyln8yy3128g43y134v5li9k5a6mb2fwa0jl8zffmhfc209k", "vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la", - "version": "4.5.0" + "version": "4.6.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.17.0", - "sha256": "10mj1dvz7q3w250hvi3k4rj2x0mn592gw2xcy1j98x5ll6kx4ynd", - "vendorSha256": "1bhygkkgd3j971cg6wha57cyh4ggbkaihw6sn6p9jvdi1k1f63lw", - "version": "1.17.0" + "rev": "v1.18.0", + "sha256": "1qvhdshaiy1v7557nkh869k1wmz604pv2gchv98vrm3cp7zj83zn", + "vendorSha256": "1rgvil2kw38kbgbgcjy8mbkahj6zm91s187x41vd4x7ypc5kgbkn", + "version": "1.18.0" }, "gridscale": { "owner": "gridscale", @@ -466,10 +466,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.32.0", - "sha256": "1k5d4a488mrba6cvpcbhd9hqhhb977yi89p32wlfx266mf11w2yw", + "rev": "v1.32.1", + "sha256": "05rm1cmpbmavza1pyqjzrd316v6r68427cjhqy6bngb749nc1als", "vendorSha256": null, - "version": "1.32.0" + "version": "1.32.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -493,10 +493,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.37.1", - "sha256": "1m9038ylv44xhgws0jrqdynj7kd97x9jgk1npqblbfv86fccwqxc", - "vendorSha256": "1a8zy023j3mcy3bswyrmllkgv61wiyxa1f7bfj8mxx3701rsb4ji", - "version": "1.37.1" + "rev": "v1.38.0", + "sha256": "0cbyq74fy3y7ia8lywr8amwcjq53bn3psymyl5cnwqx8y97avx5w", + "vendorSha256": "0cgl87pij4amn77ksbrzl0qlf6a5ga29b64cnasq8lq03lbmqzw4", + "version": "1.38.0" }, "icinga2": { "owner": "Icinga", @@ -674,10 +674,10 @@ "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.1.1", - "sha256": "0ifrpamajmrqa3fmsg4qyag1i7ghrswbhl0ixj8hgw7kzbzslsyd", - "vendorSha256": "1xrpgrzk5hr7qc5zm7nq5ljhc4sgzbsaxfszc8dlpc5y49j5q0ip", - "version": "1.1.1" + "rev": "v1.2.0", + "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi", + "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks", + "version": "1.2.0" }, "ncloud": { "owner": "NaverCloudPlatform", @@ -701,10 +701,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.34.1", - "sha256": "1j7r6cac1ajp8f6h2492dnz7ihkxbdi8js535dv04kiah79r49d5", - "vendorSha256": "0qbrrh5qdbcnzmf69jilcd9qql526w9mf4ix8y8bi94w7m0nwxap", - "version": "2.34.1" + "rev": "v2.35.0", + "sha256": "0pwy3vsj332v82n3is6xaw4mgvv968ffr8n41s1r7j39r8bpl77f", + "vendorSha256": "13xqrdv0xnza0yxdgk155x4vq8lai9jrjvnfp153jb5p5hfnzwmp", + "version": "2.35.0" }, "nomad": { "owner": "hashicorp", @@ -757,19 +757,19 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.58.0", - "sha256": "0cxzy9sj4n7yz7zbqhpkr92h7gqqfx7qxpr0a1jgh9a087j3752c", + "rev": "v4.59.0", + "sha256": "12i4j95g08c887xxplc90hcxwsrpwcn5qjyy5inazr21vqscjx2h", "vendorSha256": null, - "version": "4.58.0" + "version": "4.59.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.20.2", - "sha256": "0qlm99m4dljnczsypn4gmw9n4vvxkfazi21hvkbkgy2v3wmhsms9", - "vendorSha256": "0fyxm6wff5pz5g3rjnia23npar9qbwcv01pa3rsskxkl8jc3v13j", - "version": "3.20.2" + "rev": "v3.20.3", + "sha256": "0m9y0dagav1pw8cz6pv9zkhag59f9bbn8b6zi1h3lcgvmzf303wv", + "vendorSha256": "156nyjga5q5mgwiq6aynp199i0hn5mvckj2h7j3pfzc1yz8ri5cc", + "version": "3.20.3" }, "oktaasa": { "owner": "oktadeveloper", @@ -857,10 +857,10 @@ "owner": "PaloAltoNetworks", "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos", "repo": "terraform-provider-panos", - "rev": "v1.9.1", - "sha256": "05jsap80dcgmncxa8xbx1hnrbpi9bxjz2k9jnfnws1pmbjxl94hf", + "rev": "v1.9.2", + "sha256": "03585rm434lcp6xk58185i78iv5fjd18z7nrdnbhxxy94yhhf335", "vendorSha256": null, - "version": "1.9.1" + "version": "1.9.2" }, "pass": { "owner": "camptocamp", @@ -1001,10 +1001,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.64.2", - "sha256": "0h47ik93lhb9mjg3ai9n76ya918h1mk3fyp70yr26rwc3rihvjm6", - "vendorSha256": "1lv305kamb3xnw3a2q45ndn7a88ifnh8j8ngv7awc41028j539w4", - "version": "1.64.2" + "rev": "v1.65.0", + "sha256": "1gk4v6lxa4k8za6c1zxrrrc6qw3ymsk46w97qhfri6y7vrc3vxh0", + "vendorSha256": "0xhzj8lmrh0mcpbxa7xkzhhgl3jfk6mz5adia0jgflgrx4wjaf38", + "version": "1.65.0" }, "stackpath": { "owner": "stackpath", @@ -1046,10 +1046,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.60.26", - "sha256": "1diwiyfswmgqm1iizj228s2ysrnx4z3lqlq82a7gp0z9p8rzd0vs", + "rev": "v1.61.1", + "sha256": "1v6b8ldg6pkphqy5aphdhig1q3iizzfrj611k39lyk1q3q914yf4", "vendorSha256": null, - "version": "1.60.26" + "version": "1.61.1" }, "tfe": { "owner": "hashicorp", @@ -1128,10 +1128,10 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.5.0", - "sha256": "1sdcjizg0gip55042p0599wvjicibyx9kiymxq45af14yhnwqyv5", + "rev": "v3.5.1", + "sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q", "vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s", - "version": "3.5.0" + "version": "3.5.1" }, "venafi": { "deleteVendor": true, From 7a41423022053696be6c393c67ce1e7c510741dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Jan 2022 10:49:45 +0100 Subject: [PATCH 32/33] python3Packages.demjson: only run tests on Python 2 --- .../python-modules/demjson/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix index 25e2692af3ba..a25ecd74b5d0 100644 --- a/pkgs/development/python-modules/demjson/default.nix +++ b/pkgs/development/python-modules/demjson/default.nix @@ -1,25 +1,34 @@ -{ lib, python, buildPythonPackage, fetchPypi, isPy3k }: +{ lib +, python +, buildPythonPackage +, fetchPypi +, isPy3k +}: buildPythonPackage rec { pname = "demjson"; version = "2.2.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; }; - checkPhase = lib.optionalString isPy3k '' - ${python.interpreter} -m lib2to3 -w test/test_demjson.py - '' + '' + doCheck = !(isPy3k); + + checkPhase = '' ${python.interpreter} test/test_demjson.py ''; + pythonImportsCheck = [ + "demjson" + ]; + meta = with lib; { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = "https://github.com/dmeranda/demjson"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; }; } From 1ea75adb020b250a8459b6cadcb66543b6c1e217 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sun, 16 Jan 2022 10:52:12 +0200 Subject: [PATCH 33/33] git-workspace: 0.8.0 -> 0.9.0 --- .../git-and-tools/git-workspace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index b0279f004c24..7783c28927cf 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA="; + sha256 = "sha256-uP1sex4Hx57ZsqVG4b3809FzFB10Un48+vbwaWZ7HSg="; }; - cargoSha256 = "sha256-X0jRwDUVzS1s2tG6N2RDaFqwUUAT+mPMEft11VkJy5A="; + cargoSha256 = "sha256-mkrC8uzfNpL0MQUMjcNaJf5c1wSdlBVg8AMgc/zxM6A="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]