aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2020-11-23 21:22:11 +0100
committerAdrian Kummerlaender2020-11-23 21:22:11 +0100
commitc86775554c6a9e56e843874e11c028b24f20ba55 (patch)
treee219ab56f4cc9c378113ca6d3a47603b3a5c190e
parent018973ec92d0290daa79af6731b2205d02702def (diff)
downloadnixos_home-c86775554c6a9e56e843874e11c028b24f20ba55.tar
nixos_home-c86775554c6a9e56e843874e11c028b24f20ba55.tar.gz
nixos_home-c86775554c6a9e56e843874e11c028b24f20ba55.tar.bz2
nixos_home-c86775554c6a9e56e843874e11c028b24f20ba55.tar.lz
nixos_home-c86775554c6a9e56e843874e11c028b24f20ba55.tar.xz
nixos_home-c86775554c6a9e56e843874e11c028b24f20ba55.tar.zst
nixos_home-c86775554c6a9e56e843874e11c028b24f20ba55.zip
Update nixpkgs and use kcachegrind instead of qcachegrind
Qcachegrind has this annoying Qt XCB bug, this time not fixable by installing Qt to the user environment.
-rw-r--r--gui/apps/dev.nix2
-rw-r--r--nix/sources.json6
2 files changed, 4 insertions, 4 deletions
diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix
index e3b8cc2..3b58313 100644
--- a/gui/apps/dev.nix
+++ b/gui/apps/dev.nix
@@ -6,7 +6,7 @@
# UI dev utilities (language environments are maintained in project specific nix-shells)
zeal
hotspot
- qcachegrind
+ kcachegrind
paraview
# version control
gitg
diff --git a/nix/sources.json b/nix/sources.json
index c8933f2..708875c 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -54,10 +54,10 @@
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "edb26126d98bc696f4f3e206583faa65d3d6e818",
- "sha256": "1cl4ka4kk7kh3bl78g06dhiidazf65q8miyzaxi9930d6gwyzkci",
+ "rev": "58f9c4c7d3a42c912362ca68577162e38ea8edfb",
+ "sha256": "1517dy07jf4zhzknqbgm617lgjxsn7a6k1vgq61c67f6h55qs5ij",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/edb26126d98bc696f4f3e206583faa65d3d6e818.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs/archive/58f9c4c7d3a42c912362ca68577162e38ea8edfb.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-unstable": {