Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-06-18 18:01:45 +00:00 committed by GitHub
commit 8c7f102a14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 140 additions and 120 deletions

View file

@ -8,13 +8,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "vorta"; pname = "vorta";
version = "0.8.6"; version = "0.8.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "borgbase"; owner = "borgbase";
repo = "vorta"; repo = "vorta";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-J/Cl+et4AS44PPG2SmOHosKVw0XtOyNL0qJk68OHwQc="; sha256 = "sha256-9SfHZbNM+lRtwLO/0dE9C4cHb3pSPkxBUITYNEdPMQw=";
}; };
nativeBuildInputs = [ wrapQtAppsHook ]; nativeBuildInputs = [ wrapQtAppsHook ];

View file

@ -14,12 +14,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "splitter"; pname = "splitter";
version = "651"; version = "652";
src = fetchsvn { src = fetchsvn {
url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk";
rev = version; rev = version;
sha256 = "sha256-j6U+Wvxef151NEwkpuv4VdMac/cOT9YZUgkt+YPGCuk="; sha256 = "sha256-yCdVOT8if3AImD4Q63gKfMep7WZsrCgV+IXfP4ZL3Qw=";
}; };
patches = [ patches = [

View file

@ -8,11 +8,11 @@
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
let let
pname = "zettlr"; pname = "zettlr";
version = "2.2.6"; version = "2.3.0";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
sha256 = "sha256-f01WLxp8fe7y2EwTUhpPqcRuWBs/9lMaAAOdybmHB5M="; sha256 = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {
inherit name src; inherit name src;

View file

@ -19,9 +19,9 @@
} }
}, },
"beta": { "beta": {
"version": "103.0.5060.42", "version": "103.0.5060.53",
"sha256": "0275n5g8j4sha98drjwlm6d2smwm3nmpmfpszi16cx59m6zylncq", "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf",
"sha256bin64": "0pq41iv296mk508yc1snvm5a4fvgs9y85gk2w45w973g5maipzgf", "sha256bin64": "01vzhhnngr6a7mm1y25ax8vhph6dl948fvkyhdhb9m4j5l4lcqj4",
"deps": { "deps": {
"gn": { "gn": {
"version": "2022-05-11", "version": "2022-05-11",

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "atlantis"; pname = "atlantis";
version = "0.19.2"; version = "0.19.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "runatlantis"; owner = "runatlantis";
repo = "atlantis"; repo = "atlantis";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-cd2dhrqJl/VRhOYB1g9OpOnPV92EQm8f3rRGZGVN+IY="; sha256 = "sha256-0/LrXdksljoTvhOWAyKzR/8fNqM6ZqCjfgTNUfZNdXw=";
}; };
vendorSha256 = "sha256-ux+Hw/TjeiY9VYhIQxaltZGk5CkxAab8R7kAsTaMUGc="; vendorSha256 = "sha256-HEMyJRNk7sii87cZBfuQy41n0sI+On4271bVVNVWXeg=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ipget"; pname = "ipget";
version = "0.8.0"; version = "0.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ipfs"; owner = "ipfs";
repo = "ipget"; repo = "ipget";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-qRPke8/CUmGX6v+8qv9JQCUC8T9pjwRRyGmBWvatsJ0="; sha256 = "sha256-gtDmBy7IpZCbeDG8JeKvMoaJmXpjnmKGustaNLIlTlY=";
}; };
vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg="; vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg=";

View file

@ -24,13 +24,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "horizon-eda"; pname = "horizon-eda";
version = "2.3.0"; version = "2.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "horizon-eda"; owner = "horizon-eda";
repo = "horizon"; repo = "horizon";
rev = "v${version}"; rev = "v${version}";
sha256 = "0lw5j1zqd2wdafgxl4ahcphaabs7vlw4kaa1c566hwfjxs46dmg9"; sha256 = "1vvps44n9yrzdpircl98n4061lcmwksisnf3a8xkf3qbcnixnwlp";
}; };
buildInputs = [ buildInputs = [

View file

@ -1,23 +1,24 @@
{ lib, buildGoPackage, fetchFromGitHub }: { lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec { buildGoModule rec {
pname = "git-appraise-unstable"; pname = "git-appraise";
version = "2018-02-26"; version = "unstable-2022-04-13";
rev = "2414523905939525559e4b2498c5597f86193b61";
goPackagePath = "github.com/google/git-appraise";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev;
owner = "google"; owner = "google";
repo = "git-appraise"; repo = "git-appraise";
sha256 = "04xkp1jpas1dfms6i9j09bgkydih0q10nhwn75w9ds8hi2qaa3sa"; rev = "99aeb0e71544d3e1952e208c339b1aec70968cf3";
sha256 = "sha256-TteTI8yGP2sckoJ5xuBB5S8xzm1upXmZPlcDLvXZrpc=";
}; };
meta = { vendorSha256 = "sha256-Lzq4qpDAUjKFA2T685eW9NCfzEhDsn5UR1A1cIaZadE=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Distributed code review system for Git repos"; description = "Distributed code review system for Git repos";
homepage = "https://github.com/google/git-appraise"; homepage = "https://github.com/google/git-appraise";
license = lib.licenses.asl20; license = licenses.asl20;
maintainers = [ lib.maintainers.vdemeester ]; maintainers = with maintainers; [ vdemeester ];
}; };
} }

View file

@ -2,11 +2,11 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "certifi"; pname = "certifi";
namespace = "script.module.certifi"; namespace = "script.module.certifi";
version = "2020.12.05+matrix.1"; version = "2022.5.18+matrix.1";
src = fetchzip { src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy"; sha256 = "tk4Ven35sicLxrT7SO2yx5kQORjFP6niRuS9SMocJKY=";
}; };
passthru = { passthru = {

View file

@ -2,11 +2,11 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "idna"; pname = "idna";
namespace = "script.module.idna"; namespace = "script.module.idna";
version = "2.10.0+matrix.1"; version = "3.3.0+matrix.1";
src = fetchzip { src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7"; sha256 = "gXW1BvM3CLKshVPaemjmzEoZekU0QjuxJY9zGbGwK18=";
}; };
passthru = { passthru = {

View file

@ -2,11 +2,11 @@
buildKodiAddon rec { buildKodiAddon rec {
pname = "requests"; pname = "requests";
namespace = "script.module.requests"; namespace = "script.module.requests";
version = "2.25.1+matrix.1"; version = "2.27.1+matrix.1";
src = fetchzip { src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "00qhykizvspzfwgl7qz9cyxrazs54jgin40g49v5nzmjq3qf62hb"; sha256 = "QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -2,8 +2,8 @@
buildManPages { buildManPages {
pname = "execline-man-pages"; pname = "execline-man-pages";
version = "2.8.1.0.4"; version = "2.8.3.0.2";
sha256 = "1cxi09dlzvjbilmzgmr3xvwvx0l3s1874k3gr85kbjnvp1c1r6cd"; sha256 = "0fzv5as81aqgl8llbz8c5bk5n56iyh4g70r54wmj71rh2d1pihk5";
description = "Port of the documentation for the execline suite to mdoc"; description = "Port of the documentation for the execline suite to mdoc";
maintainers = [ lib.maintainers.sternenseemann ]; maintainers = [ lib.maintainers.sternenseemann ];
} }

View file

@ -137,6 +137,10 @@
"fuzzy-clock@keepawayfromfire.co.uk", "fuzzy-clock@keepawayfromfire.co.uk",
"FuzzyClock@johngoetz" "FuzzyClock@johngoetz"
], ],
"panel-date-format": [
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
],
"disable-unredirect-fullscreen-windows": [ "disable-unredirect-fullscreen-windows": [
"unredirect@vaina.lt", "unredirect@vaina.lt",
"unredirect@aunetx" "unredirect@aunetx"
@ -167,6 +171,10 @@
"lockkeys@vaina.lt", "lockkeys@vaina.lt",
"lockkeys@fawtytoo" "lockkeys@fawtytoo"
], ],
"panel-date-format": [
"panel-date-format@keiii.github.com",
"panel-date-format@atareao.es"
],
"wireguard-indicator": [ "wireguard-indicator": [
"wireguard-indicator@gregos.me", "wireguard-indicator@gregos.me",
"wireguard-indicator@atareao.es" "wireguard-indicator@atareao.es"

View file

@ -12,6 +12,9 @@
"lockkeys@vaina.lt" = "lock-keys"; "lockkeys@vaina.lt" = "lock-keys";
"lockkeys@fawtytoo" = "lock-keys-2"; "lockkeys@fawtytoo" = "lock-keys-2";
"panel-date-format@keiii.github.com" = "panel-date-format";
"panel-date-format@atareao.es" = "panel-date-format-2";
"volume_scroller@trflynn89.pm.me" = "volume-scroller"; "volume_scroller@trflynn89.pm.me" = "volume-scroller";
"volume_scroller@noskoski" = "volume-scroller-2"; "volume_scroller@noskoski" = "volume-scroller-2";
@ -57,9 +60,6 @@
"SomaFm-Radio@alireza6677.gmail.com" = "somafm-internet-radio"; "SomaFm-Radio@alireza6677.gmail.com" = "somafm-internet-radio";
"SomaFm-Radio@cajhne.gmail.com" = "somafm-internet-radio-2"; "SomaFm-Radio@cajhne.gmail.com" = "somafm-internet-radio-2";
"panel-date-format@keiii.github.com" = "panel-date-format";
"panel-date-format@atareao.es" = "panel-date-format-2";
"extension-list@tu.berry" = "extension-list"; "extension-list@tu.berry" = "extension-list";
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug "screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug

File diff suppressed because one or more lines are too long

View file

@ -2,23 +2,23 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fpc-binary"; pname = "fpc-binary";
version = "3.2.0"; version = "3.2.2";
src = src =
if stdenv.hostPlatform.system == "i686-linux" then if stdenv.hostPlatform.system == "i686-linux" then
fetchurl { fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar"; url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar";
sha256 = "0y0510b2fbxbqz28967xx8b023k6q9fv5yclfrc1yc9mg8fyn411"; sha256 = "f62980ac0b2861221f79fdbff67836aa6912a4256d4192cfa4dfa0ac5b419958";
} }
else if stdenv.hostPlatform.system == "x86_64-linux" then else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar"; url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.x86_64-linux.tar";
sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni"; sha256 = "5adac308a5534b6a76446d8311fc340747cbb7edeaacfe6b651493ff3fe31e83";
} }
else if stdenv.hostPlatform.system == "aarch64-linux" then else if stdenv.hostPlatform.system == "aarch64-linux" then
fetchurl { fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar"; url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar";
sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71"; sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451";
} }
else throw "Not supported on ${stdenv.hostPlatform.system}."; else throw "Not supported on ${stdenv.hostPlatform.system}.";

View file

@ -3,12 +3,12 @@
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.2.0"; version = "3.2.2";
pname = "fpc"; pname = "fpc";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
sha256 = "0f38glyn3ffmqww432snhx2b8wyrq0yj1njkp4zh56lqrvm19fgr"; sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f";
}; };
buildInputs = [ startFPC gawk ]; buildInputs = [ startFPC gawk ];

View file

@ -9,7 +9,7 @@
# 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that # 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that
let let
version = "2.0.12"; version = "2.2.2-0";
# as of 2.0.10 a suffix is being added. That may or may not disappear and then # as of 2.0.10 a suffix is being added. That may or may not disappear and then
# come back, so just leave this here. # come back, so just leave this here.
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz"; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz";
sha256 = "sha256-umzvf4I6LSgWYimYLvySYDnUIxPEDiL+DGd2wT0AFbI="; sha256 = "a9832004cffec8aca69de87290441d54772bf95d5d04372249d5a5491fb674c4";
}; };
postPatch = '' postPatch = ''

View file

@ -19,16 +19,16 @@ index a7398fb9..8e46fec0 100644
{$else powerpc64} {$else powerpc64}
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true);
{$endif powerpc64} {$endif powerpc64}
@@ -164,7 +164,7 @@ begin @@ -165,7 +165,7 @@ begin
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true);
{$endif i386} {$endif i386}
{$ifdef aarch64} {$ifdef aarch64}
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true);
- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true); - LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true);
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true); + LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true);
{$endif aarch64} {$endif aarch64}
{$ifdef powerpc} {$ifdef powerpc}
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true); LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true);
@@ -185,53 +185,53 @@ begin @@ -186,53 +186,53 @@ begin
end; end;
{$ifdef m68k} {$ifdef m68k}
@ -95,7 +95,7 @@ index a7398fb9..8e46fec0 100644
{$endif sparc64} {$endif sparc64}
@@ -266,9 +266,9 @@ begin @@ -267,9 +267,9 @@ begin
libctype:=uclibc; libctype:=uclibc;
end end
{$ifdef i386} {$ifdef i386}

View file

@ -42,13 +42,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libvgm"; pname = "libvgm";
version = "unstable-2022-05-27"; version = "unstable-2022-06-17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ValleyBell"; owner = "ValleyBell";
repo = "libvgm"; repo = "libvgm";
rev = "ec6ddae3e3488b6dc9e993cb0f76d3015d2f6fff"; rev = "577ff77185aa19943e5c7a858eb2485ec75c7539";
sha256 = "AwIx4LuVSuCf7xgtximcB6N+rzC7g1ajeBdaBz6RSyk="; sha256 = "0R7qqrFs6Ap8FM5uBHX/iE+S5cQzuwWn65xxfp4/CdQ=";
}; };
outputs = [ outputs = [

View file

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "chess"; pname = "chess";
version = "1.9.1"; version = "1.9.2";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "niklasf"; owner = "niklasf";
repo = "python-${pname}"; repo = "python-${pname}";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-sJ5mw9sQQn2IP7iDjYUGf6P3FqAbHJC1R4phnwVcNIM="; sha256 = "sha256-RGAEkeE6YAik//yZt9mJdrFj4z0yxlHjZPLUaHd9yUQ=";
}; };
pythonImportsCheck = [ "chess" ]; pythonImportsCheck = [ "chess" ];

View file

@ -6,11 +6,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-reversion"; pname = "django-reversion";
version = "5.0.0"; version = "5.0.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-C63jw5k4dFEIfwxng14NPRhtdn3mpcW6U6iOr8Pyccg="; sha256 = "sha256-orJqS4SxEzgTbKnWRXpK8wcJkseoliOzSQCaEj8o6h0=";
}; };
# tests assume the availability of a mysql/postgresql database # tests assume the availability of a mysql/postgresql database

View file

@ -12,14 +12,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "schwifty"; pname = "schwifty";
version = "2022.6.0"; version = "2022.6.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-MekF96K8IPjop5764Oq6ZcvKJOTc1Qg/gV5Dz2iacBk="; sha256 = "sha256-d3V+pkq+gAWx6vAC5SDELscks+7a+fAFh31pwsCCSZU=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped"; pname = "rust-analyzer-unwrapped";
version = "2022-05-17"; version = "2022-06-13";
cargoSha256 = "sha256-H0nuS56mvo5YUAUOsEnR4Cv3iFKixoHK83BcM1PFMA8="; cargoSha256 = "sha256-pNYhX6Jh/NPIVf7labyDKxk8siHFABMSsJ3ZVBWowUo=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rust-lang"; owner = "rust-lang";
repo = "rust-analyzer"; repo = "rust-analyzer";
rev = version; rev = version;
sha256 = "sha256-vrVpgQYUuJPgK1NMb1nxlCdxjoYo40YkUbZpH2Z2mwM="; sha256 = "sha256-IArOOdvfz+864Rs7fgHolfYfcjYTlvWebeEsJgnfyqI=";
}; };
patches = [ patches = [
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
buildFeatures = lib.optional useMimalloc "mimalloc"; buildFeatures = lib.optional useMimalloc "mimalloc";
RUST_ANALYZER_REV = version; CFG_RELEASE = version;
inherit doCheck; inherit doCheck;
preCheck = lib.optionalString doCheck '' preCheck = lib.optionalString doCheck ''

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fheroes2"; pname = "fheroes2";
version = "0.9.15"; version = "0.9.16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ihhub"; owner = "ihhub";
repo = "fheroes2"; repo = "fheroes2";
rev = version; rev = version;
sha256 = "sha256-bT6asrre16NuavG7X28aHdEPeHdxMBdz2o2KCB+mrbg="; sha256 = "sha256-avN7InwC6YOWSRjV15HOKdAU8azZiFUfT6JjwfDAdCs=";
}; };
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

View file

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "grype"; pname = "grype";
version = "0.39.0"; version = "0.40.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anchore"; owner = "anchore";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Lmklcal39jbvwkJaUit3JTmafa26oDx25WzW1oQUSoc="; hash = "sha256-Lpv4A8g/yfurma5NKQFWPy5vfuOyp/dSLf4pQCFOKLY=";
# populate values that require us to use git. By doing this in postFetch we # populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -26,7 +26,7 @@ buildGoModule rec {
''; '';
}; };
vendorSha256 = "sha256-fIxVkJSREZ86KW1SMJqHSByHFTdyJfSiestIZCMsnJI="; vendorSha256 = "sha256-4dw7OPrBwpMTHY6MpAJ1p9sEauBw+k3aYmoa0ezn9Rw=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -61,6 +61,7 @@ mapAliases ({
django_extensions = django-extensions; # added 2022-01-09 django_extensions = django-extensions; # added 2022-01-09
django_guardian = django-guardian; # added 2022-05-19 django_guardian = django-guardian; # added 2022-05-19
django_modelcluster = django-modelcluster; # added 2022-04-02 django_modelcluster = django-modelcluster; # added 2022-04-02
django_reversion = django-reversion; # added 2022-06-18
django_polymorphic = django-polymorphic; # added 2022-05-24 django_polymorphic = django-polymorphic; # added 2022-05-24
django_redis = django-redis; # added 2021-10-11 django_redis = django-redis; # added 2021-10-11
django_taggit = django-taggit; # added 2021-10-11 django_taggit = django-taggit; # added 2021-10-11

View file

@ -2442,7 +2442,7 @@ in {
djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { };
django_reversion = callPackage ../development/python-modules/django_reversion { }; django-reversion = callPackage ../development/python-modules/django-reversion { };
django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { };