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

Merge staging-next into staging

parents 5f6ff7e8 1b9cef35

nixos/modules/virtualisation/cri-o.nix

+5 −2
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ with lib; 
let

  cfg = config.virtualisation.cri-o;



  crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; });

  crioPackage = pkgs.cri-o.override {

    extraPackages = cfg.extraPackages

      ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package;

  };



  format = pkgs.formats.toml { };
@@ -19,7 +22,7 @@ in 
    enable = mkEnableOption (lib.mdDoc "Container Runtime Interface for OCI (CRI-O)");



    storageDriver = mkOption {

      type = types.enum [ "btrfs" "overlay" "vfs" ];

      type = types.enum [ "aufs" "btrfs" "devmapper" "overlay" "vfs" "zfs" ];

      default = "overlay";

      description = lib.mdDoc "Storage driver to be used";

    };

pkgs/applications/audio/go-musicfox/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
# gcc only supports objc on darwin

buildGoModule.override { stdenv = clangStdenv; } rec {

  pname = "go-musicfox";

  version = "4.0.2";

  version = "4.0.3";



  src = fetchFromGitHub {

    owner = "anhoder";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-ZxyW/NUKSCcx/KGgFV2pt5ucTBP7BE7qFeTvBoRmUvQ=";

    hash = "sha256-6JOD0RsZY79jLYJqPrzc43jgR03XQEfa8B0mGvlIkF4=";

  };



  deleteVendor = true;

pkgs/applications/audio/tageditor/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 


stdenv.mkDerivation rec {

  pname = "tageditor";

  version = "3.7.8";

  version = "3.7.9";



  src = fetchFromGitHub {

    owner = "martchus";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-/34KS6nxpIsKEklSRpO+AmGAdpJhapoGe24DCCodU38=";

    hash = "sha256-QQvc9S+9h0Qy/qBROwJMZIALf/Rbj/9my4PZGxQzlnM=";

  };



  nativeBuildInputs = [

pkgs/applications/backup/vorta/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -8,19 +8,18 @@ 


python3Packages.buildPythonApplication rec {

  pname = "vorta";

  version = "0.8.10";

  version = "0.8.12";



  src = fetchFromGitHub {

    owner = "borgbase";

    repo = "vorta";

    rev = "refs/tags/v${version}";

    hash = "sha256-okxZ1kALB5l94ShStAJLfzD37MLhob8MCzhbqfVISkw=";

    rev = "v${version}";

    hash = "sha256-nLdLTh1qSKvOR2cE9HWQrIWQ9L+ynX4qF+lTtKn/Ubs=";

  };



  nativeBuildInputs = [ wrapQtAppsHook ];



  propagatedBuildInputs = with python3Packages; [

    paramiko

    peewee

    pyqt5

    python-dateutil
@@ -29,6 +28,9 @@ python3Packages.buildPythonApplication rec { 
    secretstorage

    appdirs

    setuptools

    platformdirs

  ] ++ lib.optionals stdenv.isLinux [

    qt5.qtwayland

  ];



  postPatch = ''

pkgs/applications/graphics/komikku/default.nix

+2 −14
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "komikku";

  version = "1.17.0";

  version = "1.18.0";



  format = "other";
@@ -27,21 +27,9 @@ python3.pkgs.buildPythonApplication rec { 
    owner = "valos";

    repo = "Komikku";

    rev = "v${version}";

    hash = "sha256-DxW9uefY6Fks3qSUeLMp3BB85SfLgzwBr4KO9do2y2o=";

    hash = "sha256-suqoYV+YsbCB7sUNzds6OoEMH9KO3bt2udok6oXXyls=";

  };



  patches = [

    # https://gitlab.com/valos/Komikku/-/merge_requests/208

    (fetchpatch {

      url = "https://gitlab.com/valos/Komikku/-/commit/c9a09817acd767a7cb4ceea9b212fffd798eae61.patch";

      hash = "sha256-McjQApLY7OKbdelrTeh3aRw90B6T9V5FtLL5Y62BmGA=";

    })

    (fetchpatch {

      url = "https://gitlab.com/valos/Komikku/-/commit/bda93631420f6a69a50be0068f259d60b9558930.patch";

      hash = "sha256-Xu+IaQKf0I99a2uh97j8xSlGYSJHuNPMy/zZtWRxLaM=";

    })

  ];



  nativeBuildInputs = [

    meson

    ninja