Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-01-17 12:02:01 +00:00 committed by GitHub
commit 365cb72199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
117 changed files with 582 additions and 400 deletions

View File

@ -378,6 +378,18 @@
<literal>~/.local/share/polymc/polymc.cfg</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.noto-fonts-cjk</literal> is now deprecated in
favor of <literal>pkgs.noto-fonts-cjk-sans</literal> and
<literal>pkgs.noto-fonts-cjk-serif</literal> because they each
have different release schedules. To maintain compatibility
with prior releases of Nixpkgs,
<literal>pkgs.noto-fonts-cjk</literal> is currently an alias
of <literal>pkgs.noto-fonts-cjk-sans</literal> and doesnt
include serif fonts.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-notable-changes">

View File

@ -119,6 +119,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

View File

@ -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.";

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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
]}
'';

View File

@ -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";

View File

@ -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";

View File

@ -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";

View File

@ -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 .";

View File

@ -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

View File

@ -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;

View File

@ -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; {

View File

@ -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"

View File

@ -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;
};
})

View File

@ -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

View File

@ -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 \

View File

@ -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,

View File

@ -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";

View File

@ -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"

View File

@ -13,7 +13,10 @@ let
};
};
boostPython = boost.override { enablePython = true; };
boostPython = boost.override {
enablePython = true;
python = python2;
};
in stdenv.mkDerivation rec {
pname = "twister";

View File

@ -2,7 +2,8 @@
, fetchFromGitHub, cmake
, libusb-compat-0_1, pkg-config
, usePython ? false
, python, ncurses, swig2
, python ? null
, ncurses, swig2
, extraPackages ? []
} :

View File

@ -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 ];
};
}

View File

@ -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";

View File

@ -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; {

View File

@ -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

View File

@ -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

View File

@ -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 ];

View File

@ -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 ]

View File

@ -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" ];

View File

@ -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 .

View File

@ -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";

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "7.4.26";
sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn";
version = "7.4.27";
sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563";
});
in

View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.13";
sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2";
version = "8.0.14";
sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v";
});
in

View File

@ -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";

View File

@ -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 =

View File

@ -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";

View File

@ -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 ];

View File

@ -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 ];

View File

@ -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 = [

View File

@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
, python
, python ? null
, withPython ? false
}:

View File

@ -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

View File

@ -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";

View File

@ -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";

View File

@ -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" ];

View File

@ -1,6 +1,6 @@
{ stdenv
, lib
, python
, python2
, libidn
, lua
, miniupnpc
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
python
python2
libidn
lua
miniupnpc

View File

@ -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;

View File

@ -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 = [

View File

@ -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.

View File

@ -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;
};
}

View File

@ -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 = [

View File

@ -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 ];

View File

@ -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 ];

View File

@ -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 = [

View File

@ -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}"

View File

@ -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 ];

View File

@ -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 = {

View File

@ -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";

View File

@ -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

View File

@ -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"

View File

@ -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";

View File

@ -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 ];

View File

@ -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 = {

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, python, gsettings-desktop-schemas, gtk3 }:
{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
let
pname = "heroic";

View File

@ -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)" ];

View File

@ -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 ];

View File

@ -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

View File

@ -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}

View File

@ -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

View File

@ -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: {

View File

@ -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 {
@ -1574,8 +1576,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";
@ -1591,8 +1593,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";

View File

@ -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=";
};
}

View File

@ -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 ];

View File

@ -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 {

View File

@ -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";

View File

@ -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" ];

View File

@ -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

View File

@ -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

View File

@ -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" ];

View File

@ -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

View File

@ -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"

View File

@ -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 = [

View File

@ -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
];

View File

@ -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";

View File

@ -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 {

View File

@ -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;

View File

@ -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/

View File

@ -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

View File

@ -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;

View File

@ -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; [

View File

@ -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: "

View File

@ -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
'';

View File

@ -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";

View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More