22.11 beta release

.version

@@ -1 +1 @@
-23.05
+22.11

lib/trivial.nix

@@ -195,7 +195,7 @@ rec {
      On each release the first letter is bumped and a new animal is chosen
      starting with that new letter.
   */
-  codeName = "Stoat";
+  codeName = "Raccoon";
 
   /* Returns the current nixpkgs version suffix as string. */
   versionSuffix =

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

@@ -1,51 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-23.05">
-  <title>Release 23.05 (“Stoat”, 2023.05/??)</title>
-  <para>
-    Support is planned until the end of December 2023, handing over to
-    23.11.
-  </para>
-  <section xml:id="sec-release-23.05-highlights">
-    <title>Highlights</title>
-    <para>
-      In addition to numerous new and upgraded packages, this release
-      has the following highlights:
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Create the first release note entry in this section!
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section xml:id="sec-release-23.05-new-services">
-    <title>New Services</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Create the first release note entry in this section!
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section xml:id="sec-release-23.05-incompatibilities">
-    <title>Backward Incompatibilities</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Create the first release note entry in this section!
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section xml:id="sec-release-23.05-notable-changes">
-    <title>Other Notable Changes</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Create the first release note entry in this section!
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-</section>

nixos/doc/manual/release-notes/release-notes.xml

@@ -8,7 +8,6 @@
   This section lists the release notes for each stable version of NixOS and
   current unstable revision.
  </para>
- <xi:include href="../from_md/release-notes/rl-2305.section.xml" />
  <xi:include href="../from_md/release-notes/rl-2211.section.xml" />
  <xi:include href="../from_md/release-notes/rl-2205.section.xml" />
  <xi:include href="../from_md/release-notes/rl-2111.section.xml" />

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -1,29 +0,0 @@
-# Release 23.05 (“Stoat”, 2023.05/??) {#sec-release-23.05}
-
-Support is planned until the end of December 2023, handing over to 23.11.
-
-## Highlights {#sec-release-23.05-highlights}
-
-In addition to numerous new and upgraded packages, this release has the following highlights:
-
-<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
-
-- Create the first release note entry in this section!
-
-## New Services {#sec-release-23.05-new-services}
-
-<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
-
-- Create the first release note entry in this section!
-
-## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
-
-<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
-
-- Create the first release note entry in this section!
-
-## Other Notable Changes {#sec-release-23.05-notable-changes}
-
-<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
-
-- Create the first release note entry in this section!

nixos/modules/misc/version.nix

@@ -114,7 +114,7 @@ in
     defaultChannel = mkOption {
       internal = true;
       type = types.str;
-      default = "https://nixos.org/channels/nixos-unstable";
+      default = "https://nixos.org/channels/nixos-22.11";
       description = lib.mdDoc "Default NixOS channel to which the root user is subscribed.";
     };
 

nixos/release.nix

@@ -12,7 +12,7 @@ let
 
   version = fileContents ../.version;
   versionSuffix =
-    (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
+    (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount - 428633}.${nixpkgs.shortRev}";
 
   # Run the tests for each platform.  You can run a test by doing
   # e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,

pkgs/applications/audio/whipper/default.nix

@@ -2,7 +2,6 @@
 , python3
 , fetchFromGitHub
 , fetchpatch
-, installShellFiles
 , libcdio-paranoia
 , cdrdao
 , libsndfile
@@ -36,8 +35,6 @@ in python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeBuildInputs = with python3.pkgs; [
-    installShellFiles
-
     setuptools-scm
     docutils
     setuptoolsCheckHook
@@ -68,11 +65,6 @@ in python3.pkgs.buildPythonApplication rec {
     export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
   '';
 
-  outputs = [ "out" "man" ];
-  postBuild = ''
-    make -C man
-  '';
-
   preCheck = ''
     # disable tests that require internet access
     # https://github.com/JoeLametta/whipper/issues/291
@@ -81,10 +73,6 @@ in python3.pkgs.buildPythonApplication rec {
     export HOME=$TMPDIR
   '';
 
-  postInstall = ''
-    installManPage man/*.1
-  '';
-
   passthru.tests.version = testers.testVersion {
     package = whipper;
     command = "HOME=$TMPDIR whipper --version";

pkgs/applications/misc/bottles/default.nix

@@ -1,28 +1,10 @@
-{ lib
-, fetchFromGitHub
-, fetchFromGitLab
-, gitUpdater
-, python3Packages
-, blueprint-compiler
-, meson
-, ninja
-, pkg-config
-, wrapGAppsHook4
-, appstream-glib
-, desktop-file-utils
-, librsvg
-, gtk4
-, gtksourceview5
-, libadwaita
-, steam
-, cabextract
-, p7zip
-, xdpyinfo
-, imagemagick
-, procps
-, gamescope
-, mangohud
-, vmtouch
+{ lib, fetchFromGitHub, gitUpdater
+, meson, ninja, pkg-config, wrapGAppsHook
+, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk
+, python3Packages, gettext
+, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome
+, steam, xdg-utils, pciutils, cabextract
+, freetype, p7zip, gamemode, mangohud
 , wine
 , bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs
 , bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs
@@ -39,77 +21,75 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "bottles";
-  version = "2022.10.14.1";
+  version = "2022.5.28-trento-3";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = pname;
     rev = version;
-    sha256 = "sha256-FO91GSGlc2f3TSLrlmRDPi5p933/Y16tdEpX4RcKhL0=";
+    sha256 = "sha256-KIDLRqDLFTsVAczRpTchnUtKJfVHqbYzf8MhIR5UdYY=";
   };
 
-  patches = [ ./vulkan_icd.patch ];
-
   postPatch = ''
     chmod +x build-aux/meson/postinstall.py
     patchShebangs build-aux/meson/postinstall.py
 
-    substituteInPlace bottles/backend/wine/winecommand.py \
+    substituteInPlace src/backend/wine/winecommand.py \
       --replace \
-        "command = f\"{runner} {command}\"" \
-        "command = f\"{''' if runner == 'wine' or runner == 'wine64' else '${steam-run}/bin/steam-run '}{runner} {command}\"" \
-      --replace \
-        "command = f\"{_picked['entry_point']} {command}\"" \
-        "command = f\"${steam-run}/bin/steam-run {_picked['entry_point']} {command}\""
-    '';
+        'self.__get_runner()' \
+        '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())'
+  '';
 
   nativeBuildInputs = [
-    blueprint-compiler
     meson
     ninja
     pkg-config
-    wrapGAppsHook4
-    gtk4 # gtk4-update-icon-cache
+    wrapGAppsHook
+    gettext
     appstream-glib
     desktop-file-utils
   ];
 
   buildInputs = [
-    librsvg
-    gtk4
-    gtksourceview5
-    libadwaita
+    gdk-pixbuf
+    glib
+    gobject-introspection
+    gsettings-desktop-schemas
+    gspell
+    gtk3
+    gtksourceview4
+    libhandy
+    libnotify
+    webkitgtk
+    gnome.adwaita-icon-theme
   ];
 
   propagatedBuildInputs = with python3Packages; [
     pyyaml
+    pytoml
     requests
+    pycairo
     pygobject3
+    lxml
+    dbus-python
+    gst-python
+    liblarch
     patool
     markdown
-    fvs
-    pefile
-    urllib3
-    chardet
-    certifi
-    idna
-    pillow
-    orjson
-    icoextract
   ] ++ [
+    steam-run
+    xdg-utils
+    pciutils
     cabextract
-    p7zip
-    xdpyinfo
-    imagemagick
-    procps
-
-    gamescope
-    mangohud
-    vmtouch
     wine
+    freetype
+    p7zip
+    gamemode # programs.gamemode.enable
+    mangohud
   ];
 
   format = "other";
+  strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943
   dontWrapGApps = true; # prevent double wrapping
 
   preFixup = ''

pkgs/applications/misc/bottles/vulkan_icd.patch

@@ -1,13 +0,0 @@
-diff --git a/bottles/backend/utils/vulkan.py b/bottles/backend/utils/vulkan.py
-index 6673493..07f70d1 100644
---- a/bottles/backend/utils/vulkan.py
-+++ b/bottles/backend/utils/vulkan.py
-@@ -29,6 +29,8 @@ class VulkanUtils:
-         "/etc/vulkan",
-         "/usr/local/share/vulkan",
-         "/usr/local/etc/vulkan"
-+        "/run/opengl-driver/share/vulkan/",
-+        "/run/opengl-driver-32/share/vulkan/",
-     ]
-     if "FLATPAK_ID" in os.environ:
-         __vk_icd_dirs += [

pkgs/applications/misc/keepmenu/default.nix

@@ -1,36 +0,0 @@
-{ lib, python3Packages, python3, xvfb-run }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "keepmenu";
-  version = "1.2.2";
-
-  src = python3Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "SeVNtONH1bn2hb2pBOVM3Oafrb+jARgfvRe7vUu6Gto=";
-  };
-
-  preConfigure = ''
-    export HOME=$TMPDIR
-    mkdir -p $HOME/.config/keepmenu
-    cp config.ini.example $HOME/.config/keepmenu/config.ini
-  '';
-
-  propagatedBuildInputs = with python3Packages; [
-    pykeepass
-    pynput
-  ];
-
-  checkInputs = [ xvfb-run ];
-  checkPhase = ''
-    xvfb-run python setup.py test
-  '';
-
-  pythonImportsCheck = [ "keepmenu" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/firecat53/keepmenu";
-    description = "Dmenu/Rofi frontend for Keepass databases";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ elliot ];
-  };
-}

pkgs/applications/video/jellyfin-mpv-shim/default.nix

@@ -1,7 +1,6 @@
 { lib
 , buildPythonApplication
 , fetchPypi
-, gobject-introspection
 , jellyfin-apiclient-python
 , jinja2
 , mpv
@@ -10,7 +9,6 @@
 , python-mpv-jsonipc
 , pywebview
 , tkinter
-, wrapGAppsHook
 }:
 
 buildPythonApplication rec {
@@ -22,11 +20,6 @@ buildPythonApplication rec {
     sha256 = "sha256-JiSC6WjrLsWk3/m/EHq7KNXaJ6rqT2fG9TT1jPvYlK0=";
   };
 
-  nativeBuildInputs = [
-    wrapGAppsHook
-    gobject-introspection
-  ];
-
   propagatedBuildInputs = [
     jellyfin-apiclient-python
     mpv
@@ -59,12 +52,6 @@ buildPythonApplication rec {
       --replace "notify_updates: bool = True" "notify_updates: bool = False"
   '';
 
-  # needed for pystray to access appindicator using GI
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-  dontWrapGApps = true;
-
   # no tests
   doCheck = false;
   pythonImportsCheck = [ "jellyfin_mpv_shim" ];

pkgs/applications/video/plex-mpv-shim/default.nix

@@ -1,5 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter
-, wrapGAppsHook, gobject-introspection }:
+{ lib, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc, pystray, tkinter }:
 
 buildPythonApplication rec {
   pname = "plex-mpv-shim";
@@ -12,19 +11,8 @@ buildPythonApplication rec {
     sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r";
   };
 
-  nativeBuildInputs = [
-    wrapGAppsHook
-    gobject-introspection
-  ];
-
   propagatedBuildInputs = [ mpv requests python-mpv-jsonipc pystray tkinter ];
 
-  # needed for pystray to access appindicator using GI
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-  dontWrapGApps = true;
-
   # does not contain tests
   doCheck = false;
 

pkgs/development/python-modules/fvs/default.nix

@@ -1,31 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, orjson}:
-
-buildPythonPackage rec {
-  pname = "fvs";
-  version = "0.3.4";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "FVS";
-    extension = "tar.gz";
-    sha256 = "sha256-yYd0HzdwbqB9kexJjBRRYmdsoWtZtcjCNRz0ZJVM5CI=";
-  };
-
-  propagatedBuildInputs = [
-    orjson
-  ];
-
-  # no tests in src
-  doCheck = false;
-
-  pythonImportsCheck = [
-    "fvs"
-  ];
-
-  meta = with lib; {
-    description = "File Versioning System with hash comparison and data storage to create unlinked states that can be deleted";
-    homepage = "https://github.com/mirkobrombin/FVS";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bryanasdev000 ];
-  };
-}

pkgs/development/python-modules/icoextract/default.nix

@@ -1,31 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, pefile, pillow}:
-
-buildPythonPackage rec {
-  pname = "icoextract";
-  version = "0.1.4";
-
-  src = fetchPypi {
-    inherit pname version;
-    extension = "tar.gz";
-    sha256 = "sha256-x0GEV0PUbkAzoUJgAqup9bHd7iYttGyzIZNdo8KsFyo=";
-  };
-
-  propagatedBuildInputs = [
-    pefile
-    pillow
-  ];
-
-  # tests expect mingw and multiarch
-  doCheck = false;
-
-  pythonImportsCheck = [
-    "icoextract"
-  ];
-
-  meta = with lib; {
-    description = "Extract icons from Windows PE files";
-    homepage = "https://github.com/jlu5/icoextract";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bryanasdev000 ];
-  };
-}

pkgs/development/python-modules/pystray/default.nix

@@ -1,15 +1,5 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pillow
-, xlib
-, six
-, xvfb-run
-, sphinx
-, gobject-introspection
-, pygobject3
-, gtk3
-, libayatana-appindicator }:
+{ lib, buildPythonPackage, fetchFromGitHub
+, pillow, xlib, six, xvfb-run, sphinx }:
 
 buildPythonPackage rec {
   pname = "pystray";
@@ -22,8 +12,8 @@ buildPythonPackage rec {
     sha256 = "sha256-8B178MSe4ujlnGBmQhIu+BoAh1doP9V5cL0ermLQTvs=";
   };
 
-  nativeBuildInputs = [ gobject-introspection sphinx ];
-  propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ];
+  nativeBuildInputs = [ sphinx ];
+  propagatedBuildInputs = [ pillow xlib six ];
   checkInputs = [ xvfb-run ];
 
   checkPhase = ''

pkgs/top-level/all-packages.nix

@@ -8341,8 +8341,6 @@ with pkgs;
 
   keepkey_agent = with python3Packages; toPythonApplication keepkey_agent;
 
-  keepmenu = callPackage ../applications/misc/keepmenu { };
-
   kent = callPackage ../applications/science/biology/kent { };
 
   keybase = callPackage ../tools/security/keybase {
@@ -27602,7 +27600,7 @@ with pkgs;
   bonzomatic = callPackage ../applications/editors/bonzomatic { };
 
   bottles = callPackage ../applications/misc/bottles {
-    wine = null;
+    wine = wineWowPackages.minimal;
   };
 
   brave = callPackage ../applications/networking/browsers/brave { };

pkgs/top-level/python-packages.nix

@@ -3560,8 +3560,6 @@ self: super: with self; {
 
   fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { };
 
-  fvs = callPackage ../development/python-modules/fvs { };
-
   fx2 = callPackage ../development/python-modules/fx2 { };
 
   g2pkk = callPackage ../development/python-modules/g2pkk { };
@@ -4405,8 +4403,6 @@ self: super: with self; {
 
   idasen = callPackage ../development/python-modules/idasen { };
 
-  icoextract = callPackage ../development/python-modules/icoextract { };
-
   icontract = callPackage ../development/python-modules/icontract { };
 
   identify = callPackage ../development/python-modules/identify { };