fdtools: pin to older skalibs version
fdtools hasn’t caught up with skalibs yet. We also add a revdep test that alerts us in the future if a skalibs bumb breaks fdtools again.
This commit is contained in:
parent
bf33c0e62e
commit
843dca38b8
|
@ -22,7 +22,8 @@
|
||||||
, postInstall
|
, postInstall
|
||||||
# : list Maintainer
|
# : list Maintainer
|
||||||
, maintainers ? []
|
, maintainers ? []
|
||||||
|
# : passtrhu arguments (e.g. tests)
|
||||||
|
, passthru ? {}
|
||||||
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -108,4 +109,6 @@ in stdenv.mkDerivation {
|
||||||
[ pmahoney Profpatsch qyliss ] ++ maintainers;
|
[ pmahoney Profpatsch qyliss ] ++ maintainers;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
inherit passthru;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
31
pkgs/development/libraries/skalibs/2_10.nix
Normal file
31
pkgs/development/libraries/skalibs/2_10.nix
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
{ skawarePackages }:
|
||||||
|
|
||||||
|
skawarePackages.buildPackage {
|
||||||
|
pname = "skalibs";
|
||||||
|
version = "2.10.0.3";
|
||||||
|
sha256 = "0ka6n5rnxd5sn5lycarf596d5wlak5s535zqqlz0rnhdcnpb105p";
|
||||||
|
|
||||||
|
description = "A set of general-purpose C programming libraries";
|
||||||
|
|
||||||
|
outputs = [ "lib" "dev" "doc" "out" ];
|
||||||
|
|
||||||
|
configureFlags = [
|
||||||
|
# assume /dev/random works
|
||||||
|
"--enable-force-devr"
|
||||||
|
"--libdir=\${lib}/lib"
|
||||||
|
"--dynlibdir=\${lib}/lib"
|
||||||
|
"--includedir=\${dev}/include"
|
||||||
|
"--sysdepdir=\${lib}/lib/skalibs/sysdeps"
|
||||||
|
# Empty the default path, which would be "/usr/bin:bin".
|
||||||
|
# It would be set when PATH is empty. This hurts hermeticity.
|
||||||
|
"--with-default-path="
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
rm -rf sysdeps.cfg
|
||||||
|
rm libskarnet.*
|
||||||
|
|
||||||
|
mv doc $doc/share/doc/skalibs/html
|
||||||
|
'';
|
||||||
|
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
{ skawarePackages }:
|
{ skawarePackages, pkgs }:
|
||||||
|
|
||||||
with skawarePackages;
|
with skawarePackages;
|
||||||
|
|
||||||
|
@ -30,4 +30,10 @@ buildPackage {
|
||||||
mv doc $doc/share/doc/skalibs/html
|
mv doc $doc/share/doc/skalibs/html
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
# fdtools is one of the few non-skalib packages that depends on skalibs
|
||||||
|
# and might break if skalibs gets an breaking update.
|
||||||
|
fdtools = pkgs.fdtools;
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,10 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "fdtools";
|
pname = "fdtools";
|
||||||
|
# When you update, check whether we can drop the skalibs pin.
|
||||||
version = "2020.05.04";
|
version = "2020.05.04";
|
||||||
sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla";
|
sha256 = "0lnafcp4yipi0dl8gh33zjs8wlpz0mim8mwmiz9s49id0b0fmlla";
|
||||||
|
skalibs = skawarePackages.skalibs_2_10;
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
|
@ -16,7 +18,10 @@ in stdenv.mkDerivation {
|
||||||
patches = [ ./new-skalibs.patch ];
|
patches = [ ./new-skalibs.patch ];
|
||||||
outputs = [ "bin" "lib" "dev" "doc" "out" ];
|
outputs = [ "bin" "lib" "dev" "doc" "out" ];
|
||||||
|
|
||||||
buildInputs = [ skawarePackages.skalibs ];
|
buildInputs = [
|
||||||
|
# temporary, until fdtools catches up to skalibs
|
||||||
|
skalibs
|
||||||
|
];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
cd ${pname}-${version}
|
cd ${pname}-${version}
|
||||||
|
@ -27,7 +32,7 @@ in stdenv.mkDerivation {
|
||||||
conf-compile/defaults/host_compile.sh \
|
conf-compile/defaults/host_compile.sh \
|
||||||
> conf-compile/host_compile.sh
|
> conf-compile/host_compile.sh
|
||||||
|
|
||||||
echo "${skawarePackages.skalibs.lib}/lib/skalibs/sysdeps" \
|
echo "${skalibs.lib}/lib/skalibs/sysdeps" \
|
||||||
> conf-compile/depend_skalibs_sysdeps
|
> conf-compile/depend_skalibs_sysdeps
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -18948,6 +18948,7 @@ with pkgs;
|
||||||
skaffold = callPackage ../development/tools/skaffold { };
|
skaffold = callPackage ../development/tools/skaffold { };
|
||||||
|
|
||||||
skalibs = skawarePackages.skalibs;
|
skalibs = skawarePackages.skalibs;
|
||||||
|
skalibs_2_10 = skawarePackages.skalibs_2_10;
|
||||||
|
|
||||||
skawarePackages = recurseIntoAttrs rec {
|
skawarePackages = recurseIntoAttrs rec {
|
||||||
cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { };
|
cleanPackaging = callPackage ../build-support/skaware/clean-packaging.nix { };
|
||||||
|
@ -18957,6 +18958,7 @@ with pkgs;
|
||||||
buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { };
|
buildManPages = callPackage ../build-support/skaware/build-skaware-man-pages.nix { };
|
||||||
|
|
||||||
skalibs = callPackage ../development/libraries/skalibs { };
|
skalibs = callPackage ../development/libraries/skalibs { };
|
||||||
|
skalibs_2_10 = callPackage ../development/libraries/skalibs/2_10.nix { };
|
||||||
execline = callPackage ../tools/misc/execline { };
|
execline = callPackage ../tools/misc/execline { };
|
||||||
|
|
||||||
execline-man-pages = callPackage ../data/documentation/execline-man-pages {
|
execline-man-pages = callPackage ../data/documentation/execline-man-pages {
|
||||||
|
|
Loading…
Reference in a new issue