* bunny: init at 1.1
Motivation for this change
Pretty useful not to have to think about what system you're on when
doing basic (un)installation tasks.
* Fixed typo
Cargo.nix was generated from cargo-download 0.1.1 with this patch
applied, which was necessary to not confuse carnix about the version
being different between Cargo.toml and Cargo.lock.
See https://github.com/Xion/cargo-download/pull/3.
From 5efd4cf11ff9d5042712303404169016b1e05c33 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 26 Jul 2018 21:19:06 +0200
Subject: [PATCH] Fix Cargo.lock
Running `cargo build` on a clean checkout produces a diff in Cargo.lock,
because it wasn't updated after the version number was bumped.
After this commit, `cargo build` should no longer produce a modified
working tree.
---
Cargo.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Cargo.lock b/Cargo.lock
index cc7357c..c384dc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ dependencies = [
[[package]]
name = "cargo-download"
-version = "0.1.0"
+version = "0.1.1"
dependencies = [
"ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)",
--
2.17.1
This causes collisions between the build outputs of `nix` when building
in an environment with `nix1.perl-bindings` and `nix`:
```
collision between `/nix/store/aa4rrcj7dg2xj4rfkiclcmp745ibqng0-nix-2.0.4/lib/libnixstore.so' and `/nix/store/sp0sdi4bll80h58big1iy8kkh3qqxpw2-nix-1.11.16/lib/libnixstore.so'
builder for '/nix/store/wgbccin107lhm8cv9imnnvkx1j2pgibc-hydra-perl-deps.drv' failed with exit code 25
```
Unlike on linux these are not namespaced per user so this will cause
build failures if /tmp/nix-test was not removed by a previous build if
the nixbld user id doesn't match by accident. Nix already creates a
unique tempdir for builds so we can use that instead.
Fixes#44172
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
