From 68d772a38f6a588dd0c1f369a46ae74677eb46ac Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Sun, 31 May 2026 14:02:58 -0500 Subject: [PATCH 1/2] octavePackages.netcdf: Bootstrap sources ourselves --- .../octave-modules/netcdf/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix index 5a93cf59a72d..07f29825d19f 100644 --- a/pkgs/development/octave-modules/netcdf/default.nix +++ b/pkgs/development/octave-modules/netcdf/default.nix @@ -4,6 +4,8 @@ fetchFromGitHub, netcdf, nix-update-script, + pkg-config, + autoreconfHook, }: buildOctavePackage rec { @@ -17,10 +19,30 @@ buildOctavePackage rec { sha256 = "sha256-yt39bd6EBLj7mr6EYngPfPXEMusncc9tx5So1Cp1zkM="; }; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + propagatedBuildInputs = [ netcdf ]; + # autoreconfHook provides an autoreconfPhase that is run as a + # preconfigurePhase, which means it runs AFTER the source is un-tarred, and + # before buildOctavePackage's buildPhase re-tars it up into a format for later + # consumption by Octave's "pkg build" command. + preAutoreconf = '' + pushd src + # Upstream's bootstrap script uses wget to fetch config.guess & config.sub + # and has them committed to the repository. We must remove them so autoreconf + # actually fires for our environment. + rm config.* + ''; + postAutoreconf = '' + popd + ''; + meta = { homepage = "https://gnu-octave.github.io/packages/netcdf/"; license = lib.licenses.gpl2Plus; From e0630ede07535a463085ca22ee76e27b28326660 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 15:38:57 +0000 Subject: [PATCH 2/2] octavePackages.netcdf: 1.0.19 -> 1.0.20 --- pkgs/development/octave-modules/netcdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix index 07f29825d19f..ddb76e411052 100644 --- a/pkgs/development/octave-modules/netcdf/default.nix +++ b/pkgs/development/octave-modules/netcdf/default.nix @@ -10,13 +10,13 @@ buildOctavePackage rec { pname = "netcdf"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "gnu-octave"; repo = "octave-netcdf"; tag = "v${version}"; - sha256 = "sha256-yt39bd6EBLj7mr6EYngPfPXEMusncc9tx5So1Cp1zkM="; + sha256 = "sha256-47+8daOrPjjsVWi6Sz2V/GNK4vQ5nbGCrQmgnZRap+k="; }; nativeBuildInputs = [