From eedb627b492bbc2bc1a54be8ccc7e32dc27f80c9 Mon Sep 17 00:00:00 2001 From: patryk4815 Date: Sun, 30 Mar 2025 19:43:38 +0200 Subject: [PATCH] Bump flake.lock + cleanup nfpm.yml (#2817) * bump nixpkgs * cleanup old files --- flake.lock | 24 ++++++++++++------------ nix/bundle/nfpm.yaml | 7 ++----- nix/bundle/preremove.sh | 3 --- nix/overlay/gdb.nix | 12 +----------- 4 files changed, 15 insertions(+), 31 deletions(-) delete mode 100755 nix/bundle/preremove.sh diff --git a/flake.lock b/flake.lock index f99fba348..1aee06452 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1740916017, - "narHash": "sha256-Ze/3XCElkVljFCnBKezLldOz2ZaGp7eozxRqFzACnMI=", + "lastModified": 1743259260, + "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b58e19b11fe72175fd7a9e014a4786a91e99da5f", + "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1740362541, - "narHash": "sha256-S8Mno07MspggOv/xIz5g8hB2b/C5HPiX8E+rXzKY+5U=", + "lastModified": 1742689179, + "narHash": "sha256-kDXV6r6pQp6sxBKKxXqcTGPdiH63m8WA+IvzHhdZlEg=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "e151741c848ba92331af91f4e47640a1fb82be19", + "rev": "5c2a1faadc4015d50eb9919a8e20c112f3765fc2", "type": "github" }, "original": { @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1740921768, - "narHash": "sha256-4d27TdYoJ8B99b4kU7qESB4QVjiV9gPSuP2/MDqjDWo=", + "lastModified": 1743085397, + "narHash": "sha256-mCJgxAltNx9uzYTpaSNr6yQtDMXnRykXL87L2bLmsPo=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "ca5d23f044943a23cc4274b2d3dea45682dc025f", + "rev": "af4c3ccf8cffcd49626b0455defb0f6b22cc1910", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1740497536, - "narHash": "sha256-K+8wsVooqhaqyxuvew3+62mgOfRLJ7whv7woqPU3Ypo=", + "lastModified": 1743267007, + "narHash": "sha256-A5lFzCjO3kBnpUewPaHoM1f6qgubDqw7bgIGSi5i0JE=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "d01fd3a141755ad5d5b93dd9fcbd76d6401f5bac", + "rev": "ede084fd69a0b656acb1ac20e6609385a3f967ba", "type": "github" }, "original": { diff --git a/nix/bundle/nfpm.yaml b/nix/bundle/nfpm.yaml index d7dc9e33c..d00a27fc5 100644 --- a/nix/bundle/nfpm.yaml +++ b/nix/bundle/nfpm.yaml @@ -11,11 +11,8 @@ description: | homepage: "https://github.com/pwndbg/pwndbg" license: "MIT" contents: -- src: /usr/lib/pwndbg/bin/pwndbg +- src: /usr/lib/pwndbg-gdb/bin/pwndbg dst: /usr/bin/pwndbg type: symlink - src: ./result/pwndbg - dst: /usr/lib/pwndbg - -scripts: - preremove: ./preremove.sh \ No newline at end of file + dst: /usr/lib/pwndbg-gdb diff --git a/nix/bundle/preremove.sh b/nix/bundle/preremove.sh deleted file mode 100755 index 12db35f19..000000000 --- a/nix/bundle/preremove.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -rm -rf /usr/lib/pwndbg/cache || true diff --git a/nix/overlay/gdb.nix b/nix/overlay/gdb.nix index 9f8f0b0a4..0cdf7b22e 100644 --- a/nix/overlay/gdb.nix +++ b/nix/overlay/gdb.nix @@ -8,17 +8,7 @@ let drv = if !isCross then - prev.pwndbg_gdb.overrideAttrs ( - old: - prev.lib.optionalAttrs (prev.stdenv.targetPlatform.isDarwin && prev.stdenv.targetPlatform.isAarch64) - { - configureFlags = [ - "--target=arm-none-eabi" - ] ++ old.configureFlags; - configurePlatforms = [ ]; - meta.badPlatforms = [ ]; - } - ) + prev.pwndbg_gdb else (prev.pwndbg_gdb.override { pythonSupport = true; }).overrideAttrs (old: { patches = (old.patches or [ ]) ++ [