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

Merge master into staging-next

parents 86f6b16d 8ce8940e

nixos/tests/web-servers/agate.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    geminiserver.wait_for_open_port(1965)



    with subtest("check is serving over gemini"):

      response = geminiserver.succeed("${pkgs.gmni}/bin/gmni -j once -i -N gemini://localhost:1965")

      response = geminiserver.succeed("${pkgs.gemget}/bin/gemget --header -o - gemini://localhost:1965")

      print(response)

      assert "Hello NixOS!" in response

  '';

pkgs/applications/audio/qpwgraph/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ 


mkDerivation rec {

  pname = "qpwgraph";

  version = "0.5.1";

  version = "0.5.2";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    owner = "rncbc";

    repo = "qpwgraph";

    rev = "v${version}";

    sha256 = "sha256-HVeuqgqYf/gO1KdteXV4dWd13Q58GqHUz8CAYpruc18=";

    sha256 = "sha256-qcd19YI2RDoh+vjeelxNajWsUwVokLu0kh35a4oezKA=";

  };



  nativeBuildInputs = [ cmake pkg-config ];

pkgs/applications/blockchains/btcpayserver/default.nix

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


buildDotnetModule rec {

  pname = "btcpayserver";

  version = "1.11.1";

  version = "1.11.2";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-fKw1RKylpbejzSTO3Ti2toJiSwqtmNC1e2XDAYa9L/0=";

    sha256 = "sha256-22JQ8GqMRNfBT2ynyGhJBeGgnyAVYVBa5tUGZsleDP0=";

  };



  projectFile = "BTCPayServer/BTCPayServer.csproj";

pkgs/applications/editors/cudatext/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "cudatext";

  version = "1.196.0";

  version = "1.197.0";



  src = fetchFromGitHub {

    owner = "Alexey-T";

    repo = "CudaText";

    rev = version;

    hash = "sha256-O037+Pm/aq/9ZPMYpWlNPa9tEilatN8OJ3oBAuk4UTs=";

    hash = "sha256-960Ucp2iNDqK2n/sJSIyMWxgCCs0LVyafn8SRRhli4c=";

  };



  postPatch = ''

pkgs/applications/editors/cudatext/deps.json

+12 −12
Original line number Diff line number Diff line
@@ -6,18 +6,18 @@ 
  },

  "ATBinHex-Lazarus": {

    "owner": "Alexey-T",

    "rev": "2022.06.14",

    "hash": "sha256-3QhARraYURW5uCf2f4MZfUbxdbsg9h7BlXUxKcz4jwA="

    "rev": "2023.08.12",

    "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g="

  },

  "ATFlatControls": {

    "owner": "Alexey-T",

    "rev": "2023.05.31",

    "hash": "sha256-/CN6wa5XN5ERdFnqOXxxtT08ObtlToqe3YsLpiog40w="

    "rev": "2023.08.12",

    "hash": "sha256-YBIuwiHE83mxxtl9PNrQN3LrEBFHvYY74zhV+UtAbZ4="

  },

  "ATSynEdit": {

    "owner": "Alexey-T",

    "rev": "2023.07.05",

    "hash": "sha256-+FZjmrB8t7WM3XALqT+jvTSbBYIVLav4zSSCvMr5r+U="

    "rev": "2023.08.12",

    "hash": "sha256-hFDWb7gMQiTkItFC5KfSrpAW3FSkmAhxcc5GOdov3EE="

  },

  "ATSynEdit_Cmp": {

    "owner": "Alexey-T",
@@ -31,8 +31,8 @@ 
  },

  "ATSynEdit_Ex": {

    "owner": "Alexey-T",

    "rev": "2023.07.05",

    "hash": "sha256-dvo4lariMl/FMSp6VJEAk/Zhaz2fdBxe7aKw229DxKw="

    "rev": "2023.08.12",

    "hash": "sha256-cEu8qkmcsNwrLR5t3bfMHI9fd3wmAq/dI/iRM4I4wmQ="

  },

  "Python-for-Lazarus": {

    "owner": "Alexey-T",
@@ -41,8 +41,8 @@ 
  },

  "Emmet-Pascal": {

    "owner": "Alexey-T",

    "rev": "2022.09.18",

    "hash": "sha256-Kutl4Jh/+KptGbqakzPJnIYlFtytXVlzKWulKt4Z+/g="

    "rev": "2023.08.12",

    "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg="

  },

  "CudaText-lexers": {

    "owner": "Alexey-T",
@@ -51,7 +51,7 @@ 
  },

  "bgrabitmap": {

    "owner": "bgrabitmap",

    "rev": "v11.5.4",

    "hash": "sha256-Js7MQ1JYAl2cpnjgDOXeLcWBCrjjCnDORayRpSFoFhM="

    "rev": "v11.5.5",

    "hash": "sha256-M4ql+9zk5AJfmmHb9EG0PsJZGWcMm9/Y0lrPQqnKqcU="

  }

}