Merge master into staging-next

2021-02-11 00:36:09 +00:00
parent 7d94bb26bb 41d270c2aa
commit 5f9df37683
27 changed files with 147 additions and 93 deletions
@@ -6,6 +6,7 @@ let
    src = fetchFromGitHub {
      owner = "OpenMW";
      repo = "osg";
+      # commit does not exist on any branch on the target repository
      rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf";
      sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd";
    };