alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2021-10-30 06:02:02 +00:00 committed by GitHub
parent ba990541d1 227e1c837c
commit 1fe8dfabf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/web-apps/lemmy.nix
View file

@ -214,8 +214,6 @@ in
systemd.services.lemmy-postgresql = mkIf cfg.settings.database.createLocally { systemd.services.lemmy-postgresql = mkIf cfg.settings.database.createLocally {
description = "Lemmy postgresql db"; description = "Lemmy postgresql db";
after = [ "postgresql.service" ]; after = [ "postgresql.service" ];
bindsTo = [ "postgresql.service" ];
requiredBy = [ "lemmy.service" ];
partOf = [ "lemmy.service" ]; partOf = [ "lemmy.service" ];
script = with cfg.settings.database; '' script = with cfg.settings.database; ''
PSQL() { PSQL() {

4
pkgs/applications/editors/featherpad/default.nix
View file

@ -3,13 +3,13 @@
mkDerivation rec { mkDerivation rec {
pname = "featherpad"; pname = "featherpad";
version = "1.0.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tsujan"; owner = "tsujan";
repo = "FeatherPad"; repo = "FeatherPad";
rev = "V${version}"; rev = "V${version}";
sha256 = "sha256-GcOvof6bD7GNrABXIR8jOfzjDEN5Lvnj24M154iqQgU="; sha256 = "sha256-FeqTPDix2tqTJ3UU6i2e6FkmCO0KMNt4tLtrPjX57fc=";
}; };
nativeBuildInputs = [ cmake pkg-config qttools ]; nativeBuildInputs = [ cmake pkg-config qttools ];

4
pkgs/data/icons/whitesur-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "Whitesur-icon-theme"; pname = "Whitesur-icon-theme";
version = "2021-08-26"; version = "2021-10-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "O7nb6X20HvnzldijP/fXqAs/2qE5JUg3DEMb84ZMQp4="; sha256 = "BP5hGi3G9zNUSfeCbwYUvd3jMcWhstXiDeZCJ6Hgey8=";
}; };
nativeBuildInputs = [ gtk3 ]; nativeBuildInputs = [ gtk3 ];

6
pkgs/data/themes/flat-remix-gnome/default.nix
View file

@ -6,20 +6,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flat-remix-gnome"; pname = "flat-remix-gnome";
version = "20210921"; version = "20211028";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "daniruiz"; owner = "daniruiz";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-HnbKqdDAre2jhZH1Osf3jigz/dQpx7k0fPsVaZz7xC8="; hash = "sha256-sHJj81MmU9s5sUq5gaIT3leezuG0aVvgTD70Kho9Z0c=";
}; };
nativeBuildInputs = [ glib ]; nativeBuildInputs = [ glib ];
makeFlags = [ "PREFIX=$(out)" ]; makeFlags = [ "PREFIX=$(out)" ];
preInstall = '' preInstall = ''
# make install will back up this file, it will fail if the file doesn't exist. # make install will back up this file, it will fail if the file doesn't exist.
# https://github.com/daniruiz/flat-remix-gnome/blob/20210921/Makefile#L53 # https://github.com/daniruiz/flat-remix-gnome/blob/20211028/Makefile#L54
mkdir -p $out/share/gnome-shell/ mkdir -p $out/share/gnome-shell/
touch $out/share/gnome-shell/gnome-shell-theme.gresource touch $out/share/gnome-shell/gnome-shell-theme.gresource
''; '';

4
pkgs/development/compilers/sagittarius-scheme/default.nix
View file

@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sagittarius-scheme"; pname = "sagittarius-scheme";
version = "0.9.7"; version = "0.9.8";
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz";
sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8"; sha256 = "sha256-CdnBpTq+c04JdipfhIiI8EkVFsCc00Gh+cA5zYENMqI=";
}; };
preBuild = '' preBuild = ''
# since we lack rpath during build, need to explicitly add build path # since we lack rpath during build, need to explicitly add build path

4
pkgs/development/interpreters/clojure/babashka.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "babashka"; pname = "babashka";
version = "0.6.2"; version = "0.6.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-exNOdm17Xg4HVpjX2avoftww/flejL4mB7kSIAJUSco="; sha256 = "sha256-/ULBnC10lAYHYD0P0HGWEcCAqkX8IRcQ7W5ulho+JUM=";
}; };
dontUnpack = true; dontUnpack = true;

4
pkgs/development/libraries/gdcm/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gdcm"; pname = "gdcm";
version = "3.0.9"; version = "3.0.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "malaterre"; owner = "malaterre";
repo = "GDCM"; repo = "GDCM";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wqrM8lxJM8VL+1QEdu6Gr1XWT1j9pT6gGd3yn1yokIY="; sha256 = "sha256-KFN13kGE0E8gQBgtErvkW7Fa+3YYqQh0RA2bPS90WUI=";
}; };
cmakeFlags = [ cmakeFlags = [

6
pkgs/development/tools/go-minimock/default.nix
View file

@ -2,20 +2,20 @@
buildGoModule rec { buildGoModule rec {
pname = "go-minimock"; pname = "go-minimock";
version = "3.0.9"; version = "3.0.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gojuno"; owner = "gojuno";
repo = "minimock"; repo = "minimock";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-l+ngvmTb9yVgQYT+OeaVd0zz/xNZeXWrjMpVkMpbQIw="; sha256 = "sha256-zxEBX7+WYQE2BDZmF4N8imFOBPorrYzg55tLlWUO8Lo=";
}; };
ldflags = [ ldflags = [
"-s" "-w" "-X main.version=${version}" "-s" "-w" "-X main.version=${version}"
]; ];
vendorSha256 = "sha256-hn222ifKRYbASAHBJyMTCDwhykf2Jg9IqIUlK/GabJA="; vendorSha256 = "sha256-mIKknTrsJfFBKZrcxhnlDbvQq9q9FCOrk6ueJOoxOzk=";
doCheck = true; doCheck = true;

4
pkgs/servers/gerbera/default.nix
View file

@ -65,13 +65,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gerbera"; pname = "gerbera";
version = "1.9.1"; version = "1.9.2";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "gerbera"; repo = "gerbera";
owner = "gerbera"; owner = "gerbera";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-FtUKj3IhLMRs3VzawFgy6rnd+beW+Kvzq6tk8wPv7pw="; sha256 = "sha256-uLHiGuBXYafpY1/Q4qWFt1CTHKW7vqq0o/zqIEbEZqs=";
}; };
postPatch = lib.optionalString enableMysql '' postPatch = lib.optionalString enableMysql ''

4
pkgs/servers/misc/gobgpd/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gobgpd"; pname = "gobgpd";
version = "2.31.0"; version = "2.32.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osrg"; owner = "osrg";
repo = "gobgp"; repo = "gobgp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Q55BA5iMZP5D8lLfJn82fsxQ0SP5e4OdXtGly4j3dXU="; sha256 = "sha256-+FVd/I1folRswTPIq09xpTCai4+FVa6TYDsaPE8sYR4=";
}; };
vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw=";

6
pkgs/tools/admin/fits-cloudctl/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "fits-cloudctl"; pname = "fits-cloudctl";
version = "0.10.0"; version = "0.10.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fi-ts"; owner = "fi-ts";
repo = "cloudctl"; repo = "cloudctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "09v5fgqf4c2d6k2z638g29mcsmdisg3zfq1g7330wsd7yaxv9m23"; sha256 = "sha256-FbKULHBzx4HcOFhIRdy7DiewOQzBdac3B+N34M/Kbzk=";
}; };
vendorSha256 = "1rdqih04mlp33m69y9zxm4llx8cafwqhjhfxw873s8b35j0xz2m5"; vendorSha256 = "sha256-ImKN3rNotgUkQaKzoetAEG6Q/zlfH8FTK4HTIO0xn4s=";
meta = with lib; { meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services"; description = "Command-line client for FI-TS Finance Cloud Native services";

4
pkgs/tools/networking/gobgp/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "gobgp"; pname = "gobgp";
version = "2.31.0"; version = "2.32.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "osrg"; owner = "osrg";
repo = "gobgp"; repo = "gobgp";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Q55BA5iMZP5D8lLfJn82fsxQ0SP5e4OdXtGly4j3dXU="; sha256 = "sha256-+FVd/I1folRswTPIq09xpTCai4+FVa6TYDsaPE8sYR4=";
}; };
vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw=";