Unverified Commit a02f4e55 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

treewide: unpin python311 (#412204)

parents b210ec66 2a2b9ed5
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
{
  lib,
  fetchFromGitHub,
  python311,
  python3,
  dooit,
  nix-update-script,
}:
let
  python3 = python311;
in
python3.pkgs.buildPythonPackage rec {
  pname = "dooit-extras";
  version = "0.2.1";
+1 −4
Original line number Diff line number Diff line
@@ -2,14 +2,11 @@
  lib,
  fetchFromGitHub,
  dooit,
  python311,
  python3,
  testers,
  nix-update-script,
  extraPackages ? [ ],
}:
let
  python3 = python311;
in
python3.pkgs.buildPythonApplication rec {
  pname = "dooit";
  version = "3.2.2";
+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
  opencascade-occt_7_6,
  opencascade-occt,
  pkg-config,
  python311Packages,
  python3Packages,
  spaceNavSupport ? stdenv.hostPlatform.isLinux,
  ifcSupport ? false,
  stdenv,
@@ -40,7 +40,7 @@
  nix-update-script,
}:
let
  inherit (python311Packages)
  inherit (python3Packages)
    boost
    gitpython
    ifcopenshell
+4 −4
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@
  lib,
  stdenv,
  fetchFromGitHub,
  python311Packages,
  python3Packages,
  lilypond,
}:

python311Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
  pname = "frescobaldi";
  version = "3.3.0";

@@ -17,7 +17,7 @@ python311Packages.buildPythonApplication rec {
    sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A=";
  };

  propagatedBuildInputs = with python311Packages; [
  propagatedBuildInputs = with python3Packages; [
    qpageview
    lilypond
    pygame
@@ -28,7 +28,7 @@ python311Packages.buildPythonApplication rec {
    pyqtwebengine
  ];

  nativeBuildInputs = [ python311Packages.pyqtwebengine.wrapQtAppsHook ];
  nativeBuildInputs = [ python3Packages.pyqtwebengine.wrapQtAppsHook ];

  # Needed because source is fetched from git
  preBuild = ''
+5 −4
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@
  gobject-introspection,
  gtk3,
  intltool,
  python311Packages,
  python3Packages,
  wrapGAppsHook3,
  xdg-utils,
}:

python311Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
  pname = "gpodder";
  version = "3.11.4";
  format = "other";
@@ -35,6 +35,7 @@ python311Packages.buildPythonApplication rec {
    intltool
    wrapGAppsHook3
    gobject-introspection
    python3Packages.distutils
  ];

  buildInputs = [
@@ -42,7 +43,7 @@ python311Packages.buildPythonApplication rec {
    adwaita-icon-theme
  ];

  nativeCheckInputs = with python311Packages; [
  nativeCheckInputs = with python3Packages; [
    minimock
    pytest
    pytest-httpserver
@@ -51,7 +52,7 @@ python311Packages.buildPythonApplication rec {

  doCheck = true;

  propagatedBuildInputs = with python311Packages; [
  propagatedBuildInputs = with python3Packages; [
    feedparser
    dbus-python
    mygpoclient
Loading