From ee6ca7b54e846557b7f168062a4a1027e0ed0038 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 23 Jan 2024 11:17:06 -0600 Subject: [PATCH] chore: flake lock update and workarounds --- flake.lock | 84 ++++++++++----------- modules/home/cli-apps/spicetify/default.nix | 1 - modules/nixos/apps/retroarch/default.nix | 6 +- modules/nixos/suites/emulation/default.nix | 3 +- overlays/mysql-workbench/default.nix | 9 +++ overlays/mysql-workbench/fix-xml2.patch | 25 ++++++ overlays/nix-update/default.nix | 10 +++ overlays/ranger/default.nix | 2 +- overlays/waybar/default.nix | 4 +- 9 files changed, 95 insertions(+), 49 deletions(-) create mode 100644 overlays/mysql-workbench/default.nix create mode 100644 overlays/mysql-workbench/fix-xml2.patch create mode 100644 overlays/nix-update/default.nix diff --git a/flake.lock b/flake.lock index b832f53a3..6f335d4d5 100644 --- a/flake.lock +++ b/flake.lock @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1705833550, - "narHash": "sha256-CyzbM1mw5xUG4rV5G6FIRM44EvdOgRdWR3joqswyuIU=", + "lastModified": 1705915768, + "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91c19ab206b4b8af72f3f34a947969964ad45908", + "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", "type": "github" }, "original": { @@ -541,11 +541,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -690,11 +690,11 @@ ] }, "locked": { - "lastModified": 1705879479, - "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", + "lastModified": 1706001011, + "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", + "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", "type": "github" }, "original": { @@ -714,11 +714,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1705782792, - "narHash": "sha256-AnNvfQK3BQtri7JUmTsaAWAOBzCxEf5t3VaGm0Kezjk=", + "lastModified": 1705973554, + "narHash": "sha256-ZvzkhQA0iaUEkyCxBItps5qcSX509vpxpku1NVaiLRQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4d403dac3244aab217fb9bf17a68e9a009fcadd8", + "rev": "791e1b96b3cd12d56648b3ce7ffb0832eba2b37d", "type": "github" }, "original": { @@ -921,11 +921,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1705880578, - "narHash": "sha256-y3kp6N82eOT7HsBLT84TVps8RPA0XSRK9fWkUuPfT2g=", + "lastModified": 1705963870, + "narHash": "sha256-JYBsfBcRtd+8EHxKZ24stJbhox9VogikXSR/2Y9sYXQ=", "owner": "neovim", "repo": "neovim", - "rev": "4d4092ac9e98f04ae949c605aa6e2b55ca605a1f", + "rev": "dc466f9a63ede5e2bbddc33688c0c972abfe9a52", "type": "github" }, "original": { @@ -944,11 +944,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1705881839, - "narHash": "sha256-SqyAn/X7HpDNFPv3TMkFprUfkzrjTPhjPWJ7ObC8PvM=", + "lastModified": 1705968257, + "narHash": "sha256-/xs36Kycw7qyDEST7KrUnVcMjRq3hk90gA2PbGarux0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "45e929aad54296c766685b8eb0ebfc051b49acc3", + "rev": "ac772de590d661e08d9bdd0a2d8f15daec3b2499", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ ] }, "locked": { - "lastModified": 1705400161, - "narHash": "sha256-0MFaNIwwpVWB1N9m7cfHAM2pSVtYESQ7tlHxnDTOhM4=", + "lastModified": 1705931262, + "narHash": "sha256-JU8Dn3FeLlpC2aCXDbVH+E9koZYw/r1LW+fofWq87mE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "521fb4cdd8a2e1a00d1adf0fea7135d1faf04234", + "rev": "ed8ab00e8d92076a7cac1b428881b4d5304bb771", "type": "github" }, "original": { @@ -1082,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1705359964, - "narHash": "sha256-ys1MDjIH6z5UP7gAciRfUAlf2FJV0t3yFib965N/S+I=", + "lastModified": 1706004579, + "narHash": "sha256-zuHGMrWsyClPWIpcrIgFEe+O7izn4VLfiuHxOPB2JQ4=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "bb3eeeb96ce059ae29309138874ccf58e796f4b1", + "rev": "e0f48768503feba665a7617916d2c19b633092b1", "type": "github" }, "original": { @@ -1097,11 +1097,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705697961, - "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", + "lastModified": 1705883077, + "narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", + "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9", "type": "github" }, "original": { @@ -1168,11 +1168,11 @@ ] }, "locked": { - "lastModified": 1705871656, - "narHash": "sha256-E2iHSrE5vjEtK9m/WOk/wPRWPHJRVkhcNNj3mfOQ8yI=", + "lastModified": 1706005063, + "narHash": "sha256-qQKDesj49QU7NwSc6i4YvRaZeRzqUZIRnXOlDJiiizQ=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "051f4ab9912a2e00838d30283d6c55dc5d032f4b", + "rev": "8b519118dba0ae420f56e3ed1f6826a142a052eb", "type": "github" }, "original": { @@ -1183,11 +1183,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705677747, - "narHash": "sha256-eyM3okYtMgYDgmYukoUzrmuoY4xl4FUujnsv/P6I/zI=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bbe7d8f876fbbe7c959c90ba2ae2852220573261", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -1251,11 +1251,11 @@ }, "nur": { "locked": { - "lastModified": 1705888149, - "narHash": "sha256-+Lsx+x+2GEM53M6hnD8OY7kHBkRVKQGGX3C12LnbcOc=", + "lastModified": 1706014755, + "narHash": "sha256-RjiYDLlqM509x3NpuRgHjkT8nXq+P0v+VJzjm8RKqeE=", "owner": "nix-community", "repo": "NUR", - "rev": "384ac71f725e53d3e2acf3a86cdd8d25ca7e2ae4", + "rev": "8452fbba02b789b9046356a9546db1a312a04804", "type": "github" }, "original": { @@ -1393,11 +1393,11 @@ ] }, "locked": { - "lastModified": 1705889935, - "narHash": "sha256-77KPBK5e0ACNzIgJDMuptTtEqKvHBxTO3ksqXHHVO+4=", + "lastModified": 1705976279, + "narHash": "sha256-Zx97bJ3+O8IP70uJPD//rRsr8bcxICISMTZUT/L9eFk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e36f66bb10b09f5189dc3b1706948eaeb9a1c555", + "rev": "f889dc31ef97835834bdc3662394ebdb3c96b974", "type": "github" }, "original": { @@ -1543,11 +1543,11 @@ ] }, "locked": { - "lastModified": 1705810215, - "narHash": "sha256-9qqOsNKuIBYx59CtoAUe8gu2uARh7LF5CFNwQtYshtM=", + "lastModified": 1705983050, + "narHash": "sha256-rfb3kCoJFpD6rU7ZrYV6fUalaurvw+oowV5fwpLo26w=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "7af165abeefa0a36fe4da13c74bc9a57554cf292", + "rev": "61d83fc5ab4c982e45c823d60069a1c49b1b2a38", "type": "github" }, "original": { diff --git a/modules/home/cli-apps/spicetify/default.nix b/modules/home/cli-apps/spicetify/default.nix index 8fcfa686c..093f3ab6f 100644 --- a/modules/home/cli-apps/spicetify/default.nix +++ b/modules/home/cli-apps/spicetify/default.nix @@ -37,7 +37,6 @@ in adblock autoSkip fullAppDisplay - genre history playNext shuffle # shuffle+ (special characters are sanitized out of ext names) diff --git a/modules/nixos/apps/retroarch/default.nix b/modules/nixos/apps/retroarch/default.nix index 530442ec4..d97a52d45 100644 --- a/modules/nixos/apps/retroarch/default.nix +++ b/modules/nixos/apps/retroarch/default.nix @@ -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 ]; }) diff --git a/modules/nixos/suites/emulation/default.nix b/modules/nixos/suites/emulation/default.nix index acbdf1624..c66d4a970 100644 --- a/modules/nixos/suites/emulation/default.nix +++ b/modules/nixos/suites/emulation/default.nix @@ -27,7 +27,8 @@ in mgba mupen64plus nestopia - pcsx2 + # FIX: broken package + # pcsx2 pcsxr rpcs3 snes9x diff --git a/overlays/mysql-workbench/default.nix b/overlays/mysql-workbench/default.nix new file mode 100644 index 000000000..8559578df --- /dev/null +++ b/overlays/mysql-workbench/default.nix @@ -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"; + }); +} diff --git a/overlays/mysql-workbench/fix-xml2.patch b/overlays/mysql-workbench/fix-xml2.patch new file mode 100644 index 000000000..8d36cf67d --- /dev/null +++ b/overlays/mysql-workbench/fix-xml2.patch @@ -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 + #include + #include ++#include + #include "base/threading.h" + #include + #include +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)); diff --git a/overlays/nix-update/default.nix b/overlays/nix-update/default.nix new file mode 100644 index 000000000..e1f46c4d1 --- /dev/null +++ b/overlays/nix-update/default.nix @@ -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="; + }; + }); +} diff --git a/overlays/ranger/default.nix b/overlays/ranger/default.nix index 73fd47649..1b2e1e0d8 100644 --- a/overlays/ranger/default.nix +++ b/overlays/ranger/default.nix @@ -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 ]); }); diff --git a/overlays/waybar/default.nix b/overlays/waybar/default.nix index 94dd6e170..60a8919b8 100644 --- a/overlays/waybar/default.nix +++ b/overlays/waybar/default.nix @@ -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 ];