nur-packages

commit 75c9dd70dfee11b24993118afe69f0893ab2f91f
parent 01aed848fa20bb8be9eb6ab0ffccd2934c70e3e7
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Tue, 21 Oct 2025 23:09:52 +0400

Up

Diffstat:
M
flake.lock
 | 
6
+++---
M
pkgs/by-name/sa/sasplanet/package.nix
 | 
10
+++++-----
M
pkgs/by-name/sc/scc/package.nix
 | 
23
+++++++++++++----------
M
pkgs/by-name/ze/zed-preview-bin/package.nix
 | 
4
++--

4 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760596604,
-        "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
+        "lastModified": 1760965567,
+        "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
+        "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93",
         "type": "github"
       },
       "original": {
diff --git a/pkgs/by-name/sa/sasplanet/package.nix b/pkgs/by-name/sa/sasplanet/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitea,
   fetchgdrive,
   unzip,
-  wine,
+  wineWow64Packages,
   makeWrapper,
   withMaps ? false,
   withExtremum ? false,
@@ -27,14 +27,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sasplanet";
-  version = "250404";
+  version = "250505";
 
   src = fetchfromgh {
     owner = "sasgis";
     repo = "sas.planet.src";
     tag = "v.${finalAttrs.version}";
-    hash = "sha256-2h0mVH1IDtfHbXsjqdbxwPxQHWAEA+B9LCiBIv8zUo8=";
-    name = "SAS.Planet.Release.${finalAttrs.version}.zip";
+    hash = "sha256-FEQf3SmgV/sszDJreU2+2iHEFRbFpQw3/pcelad4cKA=";
+    name = "SAS.Planet.Release.${finalAttrs.version}.x64.zip";
   };
 
   sourceRoot = ".";
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       mkdir -p $out/opt/sasplanet
       cp -r . $out/opt/sasplanet
 
-      makeWrapper ${wine}/bin/wine $out/bin/sasplanet \
+      makeWrapper ${wineWow64Packages.stable}/bin/wine $out/bin/sasplanet \
         --run "[ -d \$HOME/.sasplanet ] || { cp -r $out/opt/sasplanet \$HOME/.sasplanet && chmod -R +w \$HOME/.sasplanet; }" \
         --add-flags "\$HOME/.sasplanet/SASPlanet.exe"
     ''
diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix
@@ -2,29 +2,32 @@
   lib,
   stdenv,
   fetchgit,
+  ed,
   qbe,
 }:
 
 stdenv.mkDerivation {
   pname = "scc";
-  version = "0-unstable-2024-02-11";
+  version = "0-unstable-2025-10-17";
 
   src = fetchgit {
     url = "git://git.simple-cc.org/scc";
-    rev = "527601ad4c29e586f0ce307353583c5c09f3c321";
-    sha256 = "sha256-tog3LCUQwjNb8ZIoztmnKNL8mo/9ik9NXNJLQmAPltA=";
-    fetchSubmodules = true;
+    rev = "e19109cd35b8d64480c74389b8faaedf5af9b0ed";
+    hash = "sha256-YTHPCslPoI70z92JuPzGRQQyk0GVixPAvqPbAaiJNb4=";
   };
 
   postPatch = ''
-    substituteInPlace src/cmd/Makefile \
-      --replace-fail "git submodule" "#git submodule"
+    substituteInPlace scripts/build/tool/gnu.mk \
+      --replace-fail "TOOL_LDFLAGS" "#TOOL_LDFLAGS"
+    substituteInPlace scripts/rules.mk \
+      --replace-fail "PREFIX = /usr/local" "PREFIX = $out"
+    substituteInPlace scripts/config \
+      --replace-fail "PREFIX:=/usr/local" "PREFIX:=$out"
   '';
 
-  #buildInputs = [ qbe ];
+  nativeBuildInputs = [ ed qbe ];
 
-  makeFlags = [
-    "PREFIX=$(out)"
+  buildFlags = [
     "AR:=$(AR)"
     "AS:=$(AS)"
     "CC:=$(CC)"
@@ -32,7 +35,7 @@ stdenv.mkDerivation {
     "HOSTCC=${stdenv.cc.targetPrefix}cc"
   ];
 
-  #doCheck = true;
+  doCheck = true;
   checkTarget = "tests";
 
   meta = {
diff --git a/pkgs/by-name/ze/zed-preview-bin/package.nix b/pkgs/by-name/ze/zed-preview-bin/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zed-preview";
-  version = "0.209.0-pre";
+  version = "0.209.2-pre";
 
   src = fetchurl {
     url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed-x86_64.dmg";
-    hash = "sha256-cgC09hP2ZDeGECKRyhrNObBNo23KGPn8+ELvPXfcc0U=";
+    hash = "sha256-jYNDlXM/QgO98hnDiK4nBmGgzOdH/nKylDX9Ulx6ZEk=";
   };
 
   sourceRoot = ".";