Unverified Commit 40cb903e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #293057 from p-rintz/pupdate

pupdate: 3.2.1 -> 3.8.0
parents 43683b20 93049f92
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
From f56083d95304752c45cc569fe42c3b0d7a2430bd Mon Sep 17 00:00:00 2001
From 84d8c110882fe23bdd05d9007225b71d4395bbaa Mon Sep 17 00:00:00 2001
From: Philipp Rintz <git@rintz.net>
Date: Wed, 24 Jan 2024 22:11:50 +0100
Date: Sun, 3 Mar 2024 18:05:40 +0100
Subject: [PATCH] uncommited

---
@@ -8,17 +8,16 @@ Subject: [PATCH] uncommited
 1 file changed, 1 insertion(+)

diff --git a/pupdate.csproj b/pupdate.csproj
index a6f59a8..0563137 100644
index 04fe5e0..962682f 100644
--- a/pupdate.csproj
+++ b/pupdate.csproj
@@ -12,6 +12,7 @@
     <Authors>Matt Pannella</Authors>
     <Product>Pupdate</Product>
     <RepositoryUrl>https://github.com/mattpannella/pocket-updater-utility</RepositoryUrl>
     <RepositoryUrl>https://github.com/mattpannella/pupdate</RepositoryUrl>
+    <RuntimeIdentifier>@RuntimeIdentifier@</RuntimeIdentifier>
     <RootNamespace>Pannella</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-- 
2.40.1
2.42.0
+1 −0
Original line number Diff line number Diff line
@@ -7,4 +7,5 @@
  (fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; })
  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
  (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
]
+5 −5
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@

buildDotnetModule rec {
  pname = "pupdate";
  version = "3.2.1";
  version = "3.8.0";

  src = fetchFromGitHub {
    owner = "mattpannella";
    repo = "${pname}";
    rev = "${version}";
    hash = "sha256-jAZozcCHgKFTPCRktajrI77iH/GBbzhWa+QKZz1w62Y=";
    hash = "sha256-i9Y0liHeHrVwkYWzC/oRRKK3fu3GVcCfM6jGO9asIdQ=";
  };

  buildInputs = [
@@ -43,11 +43,11 @@ buildDotnetModule rec {
  executables = [ "pupdate" ];

  dotnetFlags = [
    "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
    "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system} -p:TrimMode=partial"
  ];

  dotnet-sdk = dotnetCorePackages.sdk_6_0;
  dotnet-runtime = dotnetCorePackages.runtime_6_0;
  dotnet-sdk = dotnetCorePackages.sdk_7_0;
  dotnet-runtime = dotnetCorePackages.runtime_7_0;

  passthru = {
    updateScript = nix-update-script { };