nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-20 11:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51183 from matthewbauer/make-derivation-no-assertions

Browse Source 
Fix breaking changes to make-derivation
This commit is contained in:
Matthew Bauer 2018-11-29 19:35:55 -06:00 committed by GitHub
commit e6834171b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/py3exiv2/default.nix
View File

@ -19,7 +19,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./setup.patch;
version_ = "3${stdenv.lib.versions.minor python.version}";
version = "3${stdenv.lib.versions.minor python.version}";
})
];

6
pkgs/development/python-modules/py3exiv2/setup.patch
View File

@ -3,9 +3,9 @@
@@ -39,7 +39,7 @@
if '3' in l[2:]:
return l.replace('libboost', 'boost')
-libboost = get_libboost_name()
+libboost = 'boost_python@version_@'
+libboost = 'boost_python@version@'
setup(
name='py3exiv2',

2
pkgs/misc/drivers/hplip/3.16.11.nix
View File

@ -23,7 +23,7 @@ let
};
hplipState = substituteAll {
version_ = version;
inherit version;
src = ./hplip.state;
};

2
pkgs/misc/drivers/hplip/default.nix
View File

@ -25,7 +25,7 @@ let
};
hplipState = substituteAll {
version_ = version;
inherit version;
src = ./hplip.state;
};

2
pkgs/misc/drivers/hplip/hplip.state
View File

@ -1,4 +1,4 @@
[plugin]
installed=1
eula=1
version=@version_@
version=@version@

18
pkgs/stdenv/generic/make-derivation.nix
View File

@ -81,13 +81,6 @@ rec {
, ... } @ attrs:
let
# Check that the name is consistent with pname and version:
selfConsistent = (with attrs; attrs ? "name" ->
(lib.assertMsg (attrs ? "version" -> lib.strings.hasInfix version name)
"version ${version} does not appear in name ${name}" &&
lib.assertMsg (attrs ? "pname" -> lib.strings.hasInfix pname name)
"pname ${pname} does not appear in name ${name}"));
computedName = if name != "" then name else "${attrs.pname}-${attrs.version}";
# TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
@ -95,14 +88,15 @@ rec {
doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform;
doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform;
outputs' = outputs ++ lib.optional separateDebugInfo "debug";
separateDebugInfo' = separateDebugInfo && stdenv.hostPlatform.isLinux;
outputs' = outputs ++ lib.optional separateDebugInfo' "debug";
fixedOutputDrv = attrs ? outputHash;
noNonNativeDeps = builtins.length (depsBuildTarget ++ depsBuildTargetPropagated
++ depsHostHost ++ depsHostHostPropagated
++ buildInputs ++ propagatedBuildInputs
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
runtimeSensativeIfFixedOutput = fixedOutputDrv -> !noNonNativeDeps;
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || stdenv.cc == null;
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
defaultHardeningFlags = if stdenv.targetPlatform.isMusl
then supportedHardeningFlags
@ -130,7 +124,7 @@ rec {
[
(map (drv: drv.__spliced.buildBuild or drv) depsBuildBuild)
(map (drv: drv.nativeDrv or drv) nativeBuildInputs
++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional separateDebugInfo' ../../build-support/setup-hooks/separate-debug-info.sh
++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh)
(map (drv: drv.__spliced.buildTarget or drv) depsBuildTarget)
]
@ -188,12 +182,12 @@ rec {
// {
# A hack to make `nix-env -qa` and `nix search` ignore broken packages.
# TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
name = assert selfConsistent && validity.handled && (separateDebugInfo -> stdenv.hostPlatform.isLinux); computedName + lib.optionalString
name = assert validity.handled; computedName + lib.optionalString
# Fixed-output derivations like source tarballs shouldn't get a host
# suffix. But we have some weird ones with run-time deps that are
# just used for their side-affects. Those might as well since the
# hash can't be the same. See #32986.
(stdenv.hostPlatform != stdenv.buildPlatform && runtimeSensativeIfFixedOutput)
(stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
("-" + stdenv.hostPlatform.config);
builder = attrs.realBuilder or stdenv.shell;