Skip to content

Commit

Permalink
flake: Update flake.lock (#308)
Browse files Browse the repository at this point in the history
* flake.lock: Update

Flake lock file updates:

• Updated input 'buildbot-nix':
    'github:Mic92/buildbot-nix/619ed4e4360b93bfe91c523a957215dca09be63b?narHash=sha256-Qj/d/7N%2B/KV1Ay76tympOGSHHjn%2B%2BqpHi2Qwc/8g4Ec%3D' (2024-06-23)
  → 'github:Mic92/buildbot-nix/0b56574a5c823097771487d1bac952c3549fe9fb?narHash=sha256-TGZthxgxLdT8boadFm6%2BMK7HZlIxN1u1V%2Bx3hu%2BFd8I%3D' (2024-07-01)
• Updated input 'buildbot-nix/treefmt-nix':
    'github:numtide/treefmt-nix/68eb1dc333ce82d0ab0c0357363ea17c31ea1f81?narHash=sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls%3D' (2024-06-16)
  → 'github:numtide/treefmt-nix/065a23edceff48f948816b795ea8cc6c0dee7cdf?narHash=sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4%3D' (2024-06-24)
• Updated input 'dream2nix':
    'github:nix-community/dream2nix/c46b53791ca39d824e0d839209b8b1981fa295c0?narHash=sha256-QcuEO9L77Nu7ShxN1MiOmGwThLls%2B7NjWJi3COKhXuk%3D' (2024-06-23)
  → 'github:nix-community/dream2nix/1b5e01219a32324c8f6889fe1f4db933ec7932f6?narHash=sha256-04gy1icwnGO3ZXF6r96yBm/C0PNPzeLxA/8xzzq0dBI%3D' (2024-06-29)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9693852a2070b398ee123a329e68f0dab5526681?narHash=sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs%3D' (2024-06-22)
  → 'github:NixOS/nixpkgs/1e3deb3d8a86a870d925760db1a5adecc64d329d?narHash=sha256-vN5xJAZ4UGREEglh3lfbbkIj%2BMPEYMuqewMn4atZFaQ%3D' (2024-06-27)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/03d771e513ce90147b65fe922d87d3a0356fc125?narHash=sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90%2B%2BqRN3lukGaIk%3D' (2024-06-19)
  → 'github:NixOS/nixpkgs/4a1e673523344f6ccc84b37f4413ad74ea19a119?narHash=sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo%3D' (2024-06-29)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/8cd35b9496d21a6c55164d8547d9d5280162b07a?narHash=sha256-RTyqP4fBX2MdhNuMP%2BfnR3lIwbdtXhyj7w7fwtvgspc%3D' (2024-06-20)
  → 'github:cachix/pre-commit-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07?narHash=sha256-F1h%2BXIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4%3D' (2024-06-24)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/5e2e9421e9ed2b918be0a441c4535cfa45e04811?narHash=sha256-kr2QzRrplzlCP87ddayCZQS%2BdhGW98kw2zy7%2BjUXtF4%3D' (2024-06-23)
  → 'github:Mic92/sops-nix/b5974d4331fb6c893e808977a2e1a6d34b3162d6?narHash=sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8%2BawNMyqs%3D' (2024-06-30)

* taler-wallet-core: fix build, modernize

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Weijia Wang <[email protected]>
  • Loading branch information
3 people authored Jul 2, 2024
1 parent a9de64c commit e53fbf0
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 74 deletions.
42 changes: 21 additions & 21 deletions flake.lock

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

65 changes: 12 additions & 53 deletions pkgs/by-name/taler-wallet-core/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
fetchgit,
git,
jq,
moreutils,
nodePackages,
cacert,
nodejs,
pnpm,
python3,
zip,
}: let
Expand Down Expand Up @@ -38,8 +37,9 @@
mainProgram = "esbuild";
};
};
taler-wallet-core-pnpm-deps = stdenv.mkDerivation rec {
pname = "taler-wallet-core-pnpm-deps";
in
stdenv.mkDerivation rec {
pname = "taler-wallet-core";
version = "0.11.2";

src = fetchgit {
Expand All @@ -48,59 +48,21 @@
hash = "sha256-GtR87XqmunYubh9EiY3bJIqXiXrT+re3KqWypYK3NCo=";
};

nativeBuildInputs = [
jq
moreutils
nodePackages.pnpm
cacert
];

dontBuild = true;

installPhase = ''
runHook preInstall
export HOME=$(mktemp -d)
pnpm config set store-dir $out
pnpm install --frozen-lockfile --ignore-script
rm -rf $out/v3/tmp
for f in $(find $out -name "*.json"); do
sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
jq --sort-keys . $f | sponge $f
done
runHook postInstall
'';

dontFixup = true;

outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash =
{
aarch64-linux = "sha256-8n/vM4RVyfbYf34i5CtlI/Hj9LGZtCpgYVnOvBZI7x4=";
x86_64-linux = "sha256-gsWbzFNy/bH+MLisiRms+sjF0fIdbChFbWjbhl8eA+Q=";
}
.${stdenv.system}
or (throw "Unsupported system: ${stdenv.system}");
};
in
stdenv.mkDerivation {
pname = "taler-wallet-core";
inherit (taler-wallet-core-pnpm-deps) version src;
pnpmDeps = pnpm.fetchDeps {
inherit src pname;
hash = "sha256-RdG/QnZNIvQIMU7ScSFz2OfbctHBr65GWXLPvVaybfQ=";
};

nativeBuildInputs = [
git
jq
nodePackages.nodejs
nodePackages.pnpm
nodejs
pnpm.configHook
python3
zip
];

buildInputs = [nodePackages.nodejs];
buildInputs = [nodejs];

postUnpack = ''
git init -b master
Expand All @@ -121,9 +83,6 @@ in

preBuild = ''
export HOME=$(mktemp -d)
pnpm config set store-dir ${taler-wallet-core-pnpm-deps}
pnpm install --offline --frozen-lockfile --ignore-script
patchShebangs node_modules/{*,.*}
'';

Expand Down

0 comments on commit e53fbf0

Please sign in to comment.