From 273cf4f45ac4f2df7c6ebb2d8c0ec05a646af078 Mon Sep 17 00:00:00 2001 From: Vladimir Serov Date: Thu, 23 Sep 2021 14:06:35 +0300 Subject: [PATCH] super-slicer.stable: 2.3.56.8 -> 2.3.56.9 (#136962) * super-slicer.stable: 2.3.56.8 -> 2.3.56.9 super-slicer.staging: init at 2.3.57.0 * Update pkgs/applications/misc/prusa-slicer/super-slicer.nix Co-authored-by: Sandro --- .../misc/prusa-slicer/super-slicer.nix | 19 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index bc9b83178da0..479e497e3418 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,23 +1,27 @@ { lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; - version = "2.3.56.8"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; - override = super: { + + versions = { + stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; }; + staging = { version = "2.3.57.0"; sha256 = "sha256-7o0AqgQcKYc6c+Hi3x5pC/pKJZPlEsYOYk9sC21+mvM="; }; + }; + + override = { version, sha256 }: super: { inherit version pname; src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo="; + inherit sha256; rev = version; fetchSubmodules = true; }; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; - dontStrip = true; separateDebugInfo = true; # See https://github.com/supermerill/SuperSlicer/issues/432 @@ -44,5 +48,10 @@ let maintainers = with maintainers; [ cab404 moredread ]; }; + passthru = allVersions; + }; -in prusa-slicer.overrideAttrs override + + allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions; +in +allVersions.stable diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e65913da9673..7d50e425b903 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27373,6 +27373,8 @@ with pkgs; super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {};