opengl: VirtualGL fixup require basename in library filter

Prevents triggering on valid files like .solvespace-wrapped.

pkgs/all-packages.nix

@@ -25,7 +25,7 @@ self: super: pkgs: with pkgs; {
 
   openslide = callPackage ./openslide { };
 
-  ovito = libsForQt5.callPackage ./ovito.nix { libav = libav_12; };
+  ovito = libsForQt5.callPackage ./ovito.nix { };
 
   pythonOverrides = lib.composeExtensions super.pythonOverrides (import ./python-packages.nix pkgs);
 

pkgs/mfix/mfixgui.nix

@@ -8,7 +8,7 @@ buildPythonApplication rec {
 
   srcs = [
     ( fetchurl {
-        url = "https://www.sharcnet.ca/~tyson/nix/mfix-${version}.tar.gz";
+        url = "https://staff.sharcnet.ca/~tyson/nix/mfix-${version}.tar.gz";
         sha256 = "1bnwvgmrmz9y32fsnnqb4x2ab4yh9iyg1d7f3wc2w6q9fsfnzpj4";
     } )
     ( fetchFromGitHub {

pkgs/mfix/mfixsolver.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   srcs = [
     ( fetchurl {
-        url = "https://www.sharcnet.ca/~tyson/nix/mfix-${version}.tar.gz";
+        url = "https://staff.sharcnet.ca/~tyson/nix/mfix-${version}.tar.gz";
         sha256 = "1bnwvgmrmz9y32fsnnqb4x2ab4yh9iyg1d7f3wc2w6q9fsfnzpj4";
     } )
     ( fetchFromGitHub {

pkgs/opengl/insert-virtualgl.sh

@@ -240,6 +240,8 @@ EOF
 # Find all executables that depend on libGL and replace with a wrapper script that either executes the original
 # executable or a copy with an added libvglfaker.so dependency depending on whether VGL_DISPLAY is set or not.
 #
+# Only run when we are a runtime dependency (i.e., our host matches).
+#
 VGL_autoAddVGL() {
   declare opts=$(shopt -p) output
   set +o pipefail
@@ -247,7 +249,7 @@ VGL_autoAddVGL() {
   echo "Inserting VirtualGL into OpenGL executables in $prefix..." >&2
   for output in $outputs; do
     VGL_findS "${!output}" -type f \
-    | VGL_testKeepS 'VGL_isElfBin "$1" && ! [[ "$1" == .*.vgl-* ]] && ! [[ "$1" == *.so* ]]' \
+    | VGL_testKeepS 'VGL_isElfBin "$1" && ! [[ ${1##*/} == .*.vgl-* ]] && ! [[ ${1##*/} == ?*.so ]]' \
     | VGL_testKeepS 'VGL_elfLibsResolvedS "$1" | VGL_isTestAnyS '"$(VGL_quote 'VGL_isLibGL "$1"')" \
     | VGL_isTestAllS 'VGL_patch "$1"'
   done
@@ -255,4 +257,7 @@ VGL_autoAddVGL() {
   eval "$opts"
 }
 
-postFixupHooks+=(VGL_autoAddVGL)
+
+if (( hostOffset == 0 )); then
+  fixupOutputHooks+=(VGL_autoAddVGL)
+fi

pkgs/ovito.nix

@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitLab, cmake
+{ mkDerivation, lib, fetchFromGitLab, cmake
-, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, libav, python
+, boost, netcdf, hdf5, fftwSinglePrec, muparser, openssl, ffmpeg, python
 , qtbase, qtsvg, qttools, qscintilla }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
-  version = "3.3.5";
+  pname = "ovito";
-  name = "ovita-${version}";
+  version = "3.4.0";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
     rev = "v${version}";
-    sha256 = "016kc5qh1jg8xryjhizjx67pkdpirgnfwi2i92glclqimln6vnns";
+    sha256 = "1y3wr6yzpsl0qm7cicp2mppfszxd0fgx8hm99in9wff9qd0r16b5";
   };
 
   buildInputs = [
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     fftwSinglePrec
     muparser
     openssl
-    libav
+    ffmpeg
     python
     qtbase qtsvg qttools qscintilla
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Scientific visualization and analysis software for atomistic and particle simulation data";
     homepage = https://ovito.org;
     license = licenses.gpl3;

pkgs/smoove/default.nix

@@ -15,8 +15,7 @@ buildGoPackage rec {
   };
 
   postFixup = ''
-    declare -p
+    wrapProgram "$out/bin/smoove"        \
-    wrapProgram "$bin/bin/smoove"        \
       --suffix PATH : "${gzip}/bin"      \
       --suffix PATH : "${gsort}/bin"     \
       --suffix PATH : "${htslib}/bin"    \

release.nix

@@ -81,7 +81,7 @@ in let
       # The nix provided nix/unpack-channel.nix function extracts the nixpkgs from the channel,
       #
       nixpkgs =
-        ( import <nix/unpack-channel.nix> rec {
+        ( pkgs.callPackage ./unpack-channel.nix { } rec {
            name = "nixos";
            channelName = "${name}-${version}";
            src = channel + /tarballs + "/${name}-${version}${nixpkgsVersion.suffix}.tar.xz";

unpack-channel.nix

@@ -0,0 +1,45 @@
+# Hydra runs the newer nix which doesn't have corepkgs/unpack-channel.nix. The nix-daemon runs the older nix which
+# doesn't have builtins:unpack-channel. This means
+#
+#  - for now we need to provide the older corepkgs/unpack-channel.nix
+#  - in the future we should switch to src/nix-channel/unpack-channel.nix
+
+{ bash, coreutils, gnutar, xz, gzip, bzip2 }:
+
+let
+
+  tarFlags = "--warning=no-timestamp";
+
+  builder = builtins.toFile "unpack-channel.sh"
+    ''
+      mkdir $out
+      cd $out
+      xzpat="\.xz\$"
+      gzpat="\.gz\$"
+      if [[ "$src" =~ $xzpat ]]; then
+        xz -d < $src | tar xf - ${tarFlags}
+      elif [[ "$src" =~ $gzpat ]]; then
+        gzip -d < $src | tar xf - ${tarFlags}
+      else
+        bzip2 -d < $src | tar xf - ${tarFlags}
+      fi
+      if [ * != $channelName ]; then
+        mv * $out/$channelName
+      fi
+    '';
+
+in
+
+{ name, channelName, src }:
+
+derivation {
+  system = builtins.currentSystem;
+  builder = "${bash}/bin/sh";
+  args = [ "-e" builder ];
+  inherit name channelName src;
+
+  PATH = "${coreutils}/bin:${gnutar}/bin:${xz}/bin:${gzip}/bin:${bzip2}/bin";
+
+  # No point in doing this remotely.
+  preferLocalBuild = true;
+}