Merge master into staging-next

NixOS · Sep 8, 2022 · 23ffb92 · 23ffb92
2 parents 0fe3548 + ca7cdab
commit 23ffb92
Show file tree

Hide file tree

Showing 32 changed files with 243 additions and 188 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -13868,6 +13868,15 @@
     githubId = 245573;
     name = "Dmitry Kalinkin";
   };
+  victormignot = {
+    email = "victor.mignot@protonmail.com";
+    github = "victormignot";
+    githubId = 58660971;
+    name = "Victor Mignot";
+    keys = [{
+      fingerprint = "CA5D F91A D672 683A 1F65  BBC9 0317 096D 20E0 067B";
+    }];
+  };
   vidbina = {
     email = "vid@bina.me";
     github = "vidbina";

diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix
@@ -7,17 +7,18 @@
 , substituteAll
 , xorg
 , wrapGAppsHook
+, gitUpdater
 }:
 
 perlPackages.buildPerlPackage rec {
   pname = "fbmenugen";
-  version = "0.86";
+  version = "0.87";
 
   src = fetchFromGitHub {
     owner = "trizen";
     repo = pname;
     rev = version;
-    sha256 = "0ya7s8b5xbaplz365bnr580szxxsngrs2n7smj8vz8a7kwi0319q";
+    sha256 = "A0yhoK/cPp3JlNZacgLaDhaU838PpFna7luQKNDvyOg=";
   };
 
   patches = [
@@ -65,6 +66,8 @@ perlPackages.buildPerlPackage rec {
     wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB"
   '';
 
+  passthru.updateScript = gitUpdater { inherit pname version; };
+
   meta = with lib; {
     homepage = "https://github.com/trizen/fbmenugen";
     description = "Simple menu generator for the Fluxbox Window Manager";

diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kratos";
-  version = "0.9.0-alpha.3";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "ory";
     repo = "kratos";
     rev = "v${version}";
-    sha256 = "1x6g5mbbz1nkqi814dcyvdn8dyizpilzsb9cqijw0kpw4y3px757";
+    hash = "sha256-Ld2N7w9jQLkzCww1Sex5nEBZf6e9XIUnbfPOjcFAYQA=";
   };
 
-  vendorSha256 = "1v29g302zqh7sc5s53dyz1mki0iijnr6nfj4fajayz2n7bfw3kh1";
+  vendorSha256 = "sha256-9zXoJ+c1aPWDqasechC4ModWE0+sfMqZzp/Pph/mYcs=";
 
   subPackages = [ "." ];
 

diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "logseq";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchurl {
     url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    sha256 = "sha256-zzMowQnSyrxL/qCSAOB1tffizOmOpbnN6UePETAqIlM=";
+    sha256 = "sha256-1nvkjucMRAwpqg2LI+1UrICMLzSd6t0yGnYdCUNQslU=";
     name = "${pname}-${version}.AppImage";
   };
 

diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/applications/networking/cluster/terranix/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "terranix";
-  version = "2.5.4";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "mrVanDalo";
     repo = "terranix";
     rev = version;
-    sha256 = "sha256-zctvB0zpPY2C1HkMyEK6NFNuPVNGcU9b8gv9HafBd2A=";
+    sha256 = "sha256-5s9YFvbYMp8x0uoXM/jOCPPdjau6+4zeK/rGRkXBdx0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/applications/science/electronics/systemc/default.nix
@@ -0,0 +1,18 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "systemc";
+  version = "2.3.3";
+
+  src = fetchurl {
+    url = "https://www.accellera.org/images/downloads/standards/systemc/${pname}-${version}.tar.gz";
+    sha256 = "5781b9a351e5afedabc37d145e5f7edec08f3fd5de00ffeb8fa1f3086b1f7b3f";
+  };
+
+  meta = with lib; {
+    description = "The language for System-level design, modeling and verification";
+    homepage    = "https://systemc.org/";
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ victormignot ];
+  };
+}
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
@@ -18,13 +18,13 @@
 # want it to match the upstream format because sage depends on it.
 , texinfo4
 , texlive
-, enableDocs ? true
+, enableDocs ? !stdenv.isDarwin
 , enableGfanlib ? true
 }:
 
 stdenv.mkDerivation rec {
   pname = "singular";
-  version = "4.3.1";
+  version = "4.3.1p2";
 
   # since the tarball does not contain tests, we fetch from GitHub.
   src = fetchFromGitHub {
@@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
 
     # if a release is tagged (which sometimes does not happen), it will
     # be in the format below.
-    rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
-    sha256 = "sha256-3r3epwaVbyveyYtmfxuevO4Q52J6FbI6RRqiaHQGJIk=";
+    # rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
+    rev = "370a87f29e7b2a3fefe287184bd4f75b793cb03c";
+    sha256 = "sha256-T2tJ5yHTLzrXdozQB/XGZn4lNhpwVd9L30ZOzKAHxWs=";
 
     # the repository's .gitattributes file contains the lines "/Tst/
     # export-ignore" and "/doc/ export-ignore" so some directories are

diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -I nixpkgs=../../../../. -i bash -p curl jq nix gnused
+# shellcheck shell=bash
 
 set -euo pipefail
 
@@ -67,6 +68,18 @@ generate_package_list() {
     done
 }
 
+version_older () {
+    cur_version=$1
+    max_version=$2
+    result=$(nix-instantiate -I ../../../../. \
+        --eval -E "(import <nixpkgs> {}).lib.versionOlder \"$cur_version\" \"$max_version\"")
+    if [[ "$result" == "true" ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
 aspnetcore_packages () {
     local version=$1
     # These packages are implicitly references by the build process,
@@ -92,21 +105,28 @@ aspnetcore_packages () {
     # This should not happend in minor or bugfix updates, but probably happens
     # with every new major .NET release.
     local pkgs=( \
-      "Microsoft.AspNetCore.App.Ref" \
       "Microsoft.AspNetCore.App.Runtime.linux-arm" \
       "Microsoft.AspNetCore.App.Runtime.linux-arm64" \
-      "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" \
       "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" \
       "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" \
       "Microsoft.AspNetCore.App.Runtime.linux-x64" \
-      "Microsoft.AspNetCore.App.Runtime.osx-arm64" \
       "Microsoft.AspNetCore.App.Runtime.osx-x64" \
       "Microsoft.AspNetCore.App.Runtime.win-arm" \
       "Microsoft.AspNetCore.App.Runtime.win-arm64" \
       "Microsoft.AspNetCore.App.Runtime.win-x64" \
       "Microsoft.AspNetCore.App.Runtime.win-x86" \
     )
 
+    # Packages that only apply to .NET 6 and up
+    if ! version_older "$version" "6"; then
+        pkgs+=( \
+          "Microsoft.AspNetCore.App.Ref" \
+          "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" \
+          "Microsoft.AspNetCore.App.Runtime.osx-arm64" \
+        )
+    fi
+
+
     generate_package_list "$version" "${pkgs[@]}"
 }
 
@@ -135,35 +155,21 @@ sdk_packages () {
     # This should not happend in minor or bugfix updates, but probably happens
     # with every new major .NET release.
     local pkgs=( \
-      "Microsoft.NETCore.App.Composite" \
       "Microsoft.NETCore.App.Host.linux-arm" \
       "Microsoft.NETCore.App.Host.linux-arm64" \
-      "Microsoft.NETCore.App.Host.linux-musl-arm" \
       "Microsoft.NETCore.App.Host.linux-musl-arm64" \
       "Microsoft.NETCore.App.Host.linux-musl-x64" \
       "Microsoft.NETCore.App.Host.linux-x64" \
-      "Microsoft.NETCore.App.Host.osx-arm64" \
       "Microsoft.NETCore.App.Host.osx-x64" \
       "Microsoft.NETCore.App.Host.win-arm" \
       "Microsoft.NETCore.App.Host.win-arm64" \
       "Microsoft.NETCore.App.Host.win-x64" \
       "Microsoft.NETCore.App.Host.win-x86" \
-      "Microsoft.NETCore.App.Ref" \
       "Microsoft.NETCore.App.Runtime.linux-arm" \
       "Microsoft.NETCore.App.Runtime.linux-arm64" \
-      "Microsoft.NETCore.App.Runtime.linux-musl-arm" \
       "Microsoft.NETCore.App.Runtime.linux-musl-arm64" \
       "Microsoft.NETCore.App.Runtime.linux-musl-x64" \
       "Microsoft.NETCore.App.Runtime.linux-x64" \
-      "Microsoft.NETCore.App.Runtime.Mono.linux-arm" \
-      "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" \
-      "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" \
-      "Microsoft.NETCore.App.Runtime.Mono.linux-x64" \
-      "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" \
-      "Microsoft.NETCore.App.Runtime.Mono.osx-x64" \
-      "Microsoft.NETCore.App.Runtime.Mono.win-x64" \
-      "Microsoft.NETCore.App.Runtime.Mono.win-x86" \
-      "Microsoft.NETCore.App.Runtime.osx-arm64" \
       "Microsoft.NETCore.App.Runtime.osx-x64" \
       "Microsoft.NETCore.App.Runtime.win-arm" \
       "Microsoft.NETCore.App.Runtime.win-arm64" \
@@ -185,10 +191,6 @@ sdk_packages () {
       "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" \
       "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" \
       "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" \
-      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \
-      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \
-      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \
-      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \
       "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" \
       "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" \
       "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" \
@@ -197,10 +199,6 @@ sdk_packages () {
       "runtime.linux-x64.Microsoft.NETCore.DotNetHost" \
       "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" \
       "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" \
-      "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \
-      "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \
-      "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \
-      "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \
       "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" \
       "runtime.osx-x64.Microsoft.NETCore.DotNetHost" \
       "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" \
@@ -223,8 +221,36 @@ sdk_packages () {
       "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" \
     )
 
+    # Packages that only apply to .NET 6 and up
+    if ! version_older "$version" "6"; then
+        pkgs+=( \
+          "Microsoft.NETCore.App.Composite" \
+          "Microsoft.NETCore.App.Host.linux-musl-arm" \
+          "Microsoft.NETCore.App.Host.osx-arm64" \
+          "Microsoft.NETCore.App.Runtime.linux-musl-arm" \
+          "Microsoft.NETCore.App.Runtime.osx-arm64" \
+          "Microsoft.NETCore.App.Ref" \
+          "Microsoft.NETCore.App.Runtime.Mono.linux-arm" \
+          "Microsoft.NETCore.App.Runtime.Mono.linux-arm64" \
+          "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" \
+          "Microsoft.NETCore.App.Runtime.Mono.linux-x64" \
+          "Microsoft.NETCore.App.Runtime.Mono.osx-arm64" \
+          "Microsoft.NETCore.App.Runtime.Mono.osx-x64" \
+          "Microsoft.NETCore.App.Runtime.Mono.win-x64" \
+          "Microsoft.NETCore.App.Runtime.Mono.win-x86" \
+          "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \
+          "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \
+          "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \
+          "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \
+          "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \
+          "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \
+          "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \
+          "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \
+        )
+    fi
+
     # Packages that only apply to .NET 7 and up
-    if [[ ! ( "$version" =~ ^[1-6]\. ) ]]; then
+    if ! version_older "$version" "7"; then
         # ILCompiler requires nixpkgs#181373 to be fixed to work properly
         pkgs+=( \
           "runtime.linux-arm64.Microsoft.DotNet.ILCompiler" \