Merge staging-next into staging
This commit is contained in:
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-psx" + lib.optionalString withHw "-hw";
|
||||
version = "0-unstable-2026-02-27";
|
||||
version = "0-unstable-2026-03-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-psx-libretro";
|
||||
rev = "fe0b72c4b93e42a46cd062febd7de292d828248e";
|
||||
hash = "sha256-2uR5zULgWuT0sUY1KZ//RPZaIOg2LlAqX+Z5QhnvLg0=";
|
||||
rev = "3ea167a60bc37bd0c257592bb9a7f559a50465c4";
|
||||
hash = "sha256-gSNsTV1w7i6bTLngU/Zbo7bwLmb+Bu26JwUre6Rj4qc=";
|
||||
};
|
||||
|
||||
extraBuildInputs = lib.optionals withHw [
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-reader";
|
||||
version = "0-unstable-2026-02-17";
|
||||
version = "0-unstable-2026-03-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-reader";
|
||||
rev = "cbf4fa1e28ad807b60ad3555d250f0611a6a59fc";
|
||||
hash = "sha256-19Bp1EeMq1C1JP3xMfiFVDF8rqYJX4I2CzayJpqGxFM=";
|
||||
rev = "a7a2b6dab1603c28ba42a66f1ea63fd85062d22f";
|
||||
hash = "sha256-4IUgrMVDHJwdqKmu//t52Ngwr3QWeVgptDcllkyof0k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
zlib,
|
||||
nixosTests,
|
||||
postgresqlTestHook,
|
||||
@@ -20,14 +21,14 @@
|
||||
|
||||
let
|
||||
pname = "pgadmin";
|
||||
version = "9.11";
|
||||
yarnHash = "sha256-x8EbZPQxCRBfeBXJGHW1tyN3tWzTqlMGvftizspfBRw=";
|
||||
version = "9.13";
|
||||
yarnHash = "sha256-ViqjZ40M78EZ4ZOMuiAGJqx6Xyv4dqY9X7jMDbohaY8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgadmin-org";
|
||||
repo = "pgadmin4";
|
||||
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
|
||||
hash = "sha256-t+TdudbCq68fXJrcAzyESZTiA4qVkQgwF4efc4IJrl0=";
|
||||
hash = "sha256-dG8oxE9g30Dz3K3PveoMjPa1/eY9RWEV2QBdx2Dz+Rg=";
|
||||
};
|
||||
|
||||
# keep the scope, as it is used throughout the derivation and tests
|
||||
@@ -67,6 +68,12 @@ pythonPackages.buildPythonApplication rec {
|
||||
./expose-setup.py.patch
|
||||
# check for permission of /etc/pgadmin/config_system and don't fail
|
||||
./check-system-config-dir.patch
|
||||
# fix session.py See https://github.com/pgadmin-org/pgadmin4/pull/9706
|
||||
(fetchpatch2 {
|
||||
name = "session.patch";
|
||||
url = "https://github.com/pgadmin-org/pgadmin4/commit/7043587387c17635f62bab8414546bb8c0dbadf4.patch?full_index=1";
|
||||
hash = "sha256-gZrO0dBy5EklZf/dKr9j3RJ54rtzFrw53v91vqkRboY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user