Unverified Commit b9ec6f58 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 42eea93c 5d6ccc90

doc/languages-frameworks/python.section.md

+16 −0
Original line number Diff line number Diff line
@@ -361,6 +361,22 @@ modifications. 


Do pay attention to passing in the right Python version!



#### `mkPythonMetaPackage` function {#mkpythonmetapackage-function}



This will create a meta package containing [metadata files](https://packaging.python.org/en/latest/specifications/recording-installed-packages/) to satisfy a dependency on a package, without it actually having been installed into the environment.

In nixpkgs this is used to package Python packages with split binary/source distributions such as [psycopg2](https://pypi.org/project/psycopg2/)/[psycopg2-binary](https://pypi.org/project/psycopg2-binary/).



```nix

mkPythonMetaPackage {

  pname = "psycopg2-binary";

  inherit (psycopg2) optional-dependencies version;

  dependencies = [ psycopg2 ];

  meta = {

    inherit (psycopg2.meta) description homepage;

  };

}

```



#### `python.buildEnv` function {#python.buildenv-function}



Python environments can be created using the low-level `pkgs.buildEnv` function.

pkgs/applications/file-managers/nnn/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ assert withEmojis -> (!withIcons && !withNerdIcons); 


stdenv.mkDerivation (finalAttrs: {

  pname = "nnn";

  version = "4.9";

  version = "5.0";



  src = fetchFromGitHub {

    owner = "jarun";

    repo = "nnn";

    rev = "v${finalAttrs.version}";

    hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU=";

    hash = "sha256-HShHSjqD0zeE1/St1Y2dUeHfac6HQnPFfjmFvSuEXUA=";

  };



  patches = [

pkgs/applications/networking/iroh/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "iroh";

  version = "0.21.0";

  version = "0.23.0";



  src = fetchFromGitHub {

    owner = "n0-computer";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-g/x5lVVrm1NrJbqmhza/wryEwuXHh1tDBf+x6vL+2n0=";

    hash = "sha256-kXKA0gDmxruoHLTB9zJ36ydqqwaeyQm/Icqgv6API0k=";

  };



  cargoHash = "sha256-Sp2yMF/M3SuNB1DDQ79Lau5IxtSM1NPLJi9TnHWqnuc=";

  cargoHash = "sha256-XUokfLMXIYfiN4A2/aYYhq0N7H2vsZL1uvKg498M3yA=";



  buildInputs = lib.optionals stdenv.isDarwin (

    with darwin.apple_sdk.frameworks; [

pkgs/by-name/an/anytype/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


let

  pname = "anytype";

  version = "0.42.4";

  version = "0.42.5";

  name = "Anytype-${version}";

  src = fetchurl {

    url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";

    hash = "sha256-SFLjjr+L7eTqaZ2teug7mzXhIU+eVebBqrE4q5aasLk=";

    hash = "sha256-43g/CdmmQTSxk7OTZMPIiWIYJjCG2zJNM9kaAq1jOqE=";

  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };

in appimageTools.wrapType2 {

pkgs/by-name/fo/forgejo/lts.nix

+2 −2
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "7.0.7";

  hash = "sha256-Xk5ElAfTjbz77Jv5VMbSW7q8qJ5vhNd3daNilNzDsY4=";

  version = "7.0.8";

  hash = "sha256-m6yToQQFM+4g8xhs572O4n4r06xeS3DozYHtAKwMjUg=";

  npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU=";

  vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw=";

  lts = true;