Skip to content

Commit

Permalink
chore: flake lock update and workarounds
Browse files Browse the repository at this point in the history
  • Loading branch information
khaneliman committed Jan 23, 2024
1 parent e8c483c commit ee6ca7b
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 49 deletions.
84 changes: 42 additions & 42 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion modules/home/cli-apps/spicetify/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ in
adblock
autoSkip
fullAppDisplay
genre
history
playNext
shuffle # shuffle+ (special characters are sanitized out of ext names)
Expand Down
6 changes: 4 additions & 2 deletions modules/nixos/apps/retroarch/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ in
cores = with libretro; [
beetle-psx-hw
bsnes
citra
# FIX: broken package
# citra
dolphin
dosbox
genesis-plus-gx
mame
mgba
nestopia
pcsx2
# FIX: broken package
# pcsx2
snes9x
];
})
Expand Down
3 changes: 2 additions & 1 deletion modules/nixos/suites/emulation/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ in
mgba
mupen64plus
nestopia
pcsx2
# FIX: broken package
# pcsx2
pcsxr
rpcs3
snes9x
Expand Down
9 changes: 9 additions & 0 deletions overlays/mysql-workbench/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
_: _final: prev: {
mysql-workbench = prev.mysql-workbench.overrideAttrs (old: {
patches = old.patches ++ [ ./fix-xml2.patch ];

# GCC 13: error: 'int64_t' in namespace 'std' does not name a type
# when updating the version make sure this is still needed
env.CXXFLAGS = "-include cstdint";
});
}
25 changes: 25 additions & 0 deletions overlays/mysql-workbench/fix-xml2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/library/grt/src/grt.h b/library/grt/src/grt.h
index 47bfd63..59e664b 100644
--- a/library/grt/src/grt.h
+++ b/library/grt/src/grt.h
@@ -35,6 +35,7 @@
#include <stdexcept>
#include <boost/function.hpp>
#include <libxml/xmlmemory.h>
+#include <libxml/tree.h>
#include "base/threading.h"
#include <string>
#include <gmodule.h>
diff --git a/library/grt/src/unserializer.cpp b/library/grt/src/unserializer.cpp
index 6dda76d..a6f6a3c 100644
--- a/library/grt/src/unserializer.cpp
+++ b/library/grt/src/unserializer.cpp
@@ -401,7 +401,7 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si
xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT);

if (!doc) {
- xmlErrorPtr error = xmlGetLastError();
+ const xmlError* error = xmlGetLastError();

if (error)
throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message));
10 changes: 10 additions & 0 deletions overlays/nix-update/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
_: _final: prev: {
nix-update = prev.nix-update.overrideAttrs (old: {
src = prev.fetchFromGitHub {
owner = "Mic92";
repo = "nix-update";
rev = "refs/pull/202/head";
hash = "sha256-OSD8gERP4wCCw2Y3ycnIJo8J4vjM6G0pz/5mC/p+F5Q=";
};
});
}
2 changes: 1 addition & 1 deletion overlays/ranger/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _: _final: prev: {
owner = "Ethsan";
repo = "ranger";
rev = "71a06f28551611d192d3e644d95ad04023e10801";
sha256 = "sha256-Yjdn1oE5VtJMGnmQ2VC764UXKm1PrkIPXXQ8MzQ8u1U=";
hash = "sha256-Yjdn1oE5VtJMGnmQ2VC764UXKm1PrkIPXXQ8MzQ8u1U=";
};
propagatedBuildInputs = old.propagatedBuildInputs ++ (with prev.python3Packages; [ astroid pylint ]);
});
Expand Down
4 changes: 2 additions & 2 deletions overlays/waybar/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ _: _final: prev: {
src = prev.fetchFromGitHub {
owner = "Alexays";
repo = "waybar";
rev = "f744d906becbf6d06a3d95fee37af5c32061d1aa";
sha256 = "sha256-7hyOmMTkvQ1a7yQ4YA5Kheg9FLUAPV3otvDj7kGKgko=";
rev = "0d9c4929988cc8443483400631157826069a388d";
sha256 = "sha256-ozW4yGPdGY2WrVU0mxqkc0uFQUg8m6+S/JkALwDxRTw=";
};

patches = [ ./catch.patch ];
Expand Down

0 comments on commit ee6ca7b

Please sign in to comment.