nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 20:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-04-08 06:01:26 +00:00 committed by GitHub
commit 7315942381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 122 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/graphics/drawing/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
@ -29,6 +30,16 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-qNaljtuA5E/QaLJ9QILPRQCqOvKmX4ZGq/0z5unA8KA=";
};
patches = [
# Fix build with meson 0.61, can be removed on next update.
# https://github.com/NixOS/nixpkgs/issues/167584
(fetchpatch {
url = "https://github.com/maoschanz/drawing/commit/6dd271089af76b69322500778e3ad6615a117dcc.patch";
sha256 = "sha256-4pKWm3LYstVxZ4+gGsZDfM4K+7WBY8EYjylzc/CQZmo=";
includes = [ "data/meson.build" "help/meson.build" ];
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils

2
pkgs/applications/misc/index-fm/default.nix
View File

@ -3,7 +3,6 @@
, fetchFromGitLab
, cmake
, extra-cmake-modules
, applet-window-buttons
, karchive
, kcoreaddons
, ki18n
@ -38,7 +37,6 @@ mkDerivation rec {
];
buildInputs = [
applet-window-buttons
karchive
kcoreaddons
ki18n

4
pkgs/applications/misc/obsidian/default.nix
View File

@ -2,7 +2,7 @@
, fetchurl
, lib
, makeWrapper
, electron_16
, electron_17
, makeDesktopItem
, graphicsmagick
, writeScript
@ -49,7 +49,7 @@ let
installPhase = ''
runHook preInstall
mkdir -p $out/bin
makeWrapper ${electron_16}/bin/electron $out/bin/obsidian \
makeWrapper ${electron_17}/bin/electron $out/bin/obsidian \
--add-flags $out/share/obsidian/app.asar
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -24,7 +24,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "5.37.0"; # Please backport all updates to the stable channel.
version = "5.38.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "sha256-hnRS/7CZPk1bbBjpHLAywKVu2u7jgg3p5/pxEdkzMJ8=";
sha256 = "sha256-PmeJ6ZNjQjxuPl1UqunQT0q6uUZxt5gDFJS/WCcHE68=";
};
nativeBuildInputs = [

9
pkgs/data/fonts/material-design-icons/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub }:
let
version = "5.3.45";
version = "6.6.96";
in fetchFromGitHub {
name = "material-design-icons-${version}";
owner = "Templarian";
@ -16,7 +16,7 @@ in fetchFromGitHub {
cp fonts/*.woff $out/share/fonts/woff/
cp fonts/*.woff2 $out/share/fonts/woff2/
'';
sha256 = "1nwha6dbj97ybiwlf69la57l3ibmwgnzs0nr104bfqnqxjs471sx";
sha256 = "sha256-rfDb9meTF0Y0kiCQd11SgnntQnw34Ti/IXn35xaPO1M=";
meta = with lib; {
description = "4600+ Material Design Icons from the Community";
@ -26,10 +26,7 @@ in fetchFromGitHub {
color and size they need for any project.
'';
homepage = "https://materialdesignicons.com";
license = with licenses; [
asl20 # for icons from: https://github.com/google/material-design-icons
ofl
];
license = licenses.asl20;
platforms = platforms.all;
maintainers = with maintainers; [ vlaci ];
};

4
pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
View File

@ -36,11 +36,11 @@
stdenv.mkDerivation rec {
pname = "gnome-initial-setup";
version = "42.0.1";
version = "42.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "/PQ/L75NwEw6wq5QVjP+se8w2nDKleq8YeIAaxkuXlU=";
sha256 = "hmE2yjKSL3zEJNOtxrHbp86+B6qWoZ+XyAdw4/Lupxs=";
};
patches = [

4
pkgs/development/libraries/applet-window-buttons/default.nix
View File

@ -11,13 +11,13 @@
mkDerivation rec {
pname = "applet-window-buttons";
version = "0.10.1";
version = "0.11.1";
src = fetchFromGitHub {
owner = "psifidotos";
repo = "applet-window-buttons";
rev = version;
sha256 = "18h2g3jqzr88wkmws2iz71sgrz633zwkqvhn32sdi32sxxbrksgd";
hash = "sha256-Qww/22bEmjuq+R3o0UDcS6U+34qjaeSEy+g681/hcfE=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/cloudflare/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "cloudflare";
version = "2.9.9";
version = "2.9.10";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-wou62Xro/hOU3pjGdJpe2kzY15+bcd14UOn4vsw9RcI=";
hash = "sha256-LsUMB0zqlelHqWsgdmJ8v+Qn/reYuxCTKTODBT9K0bg=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/scmrepo/default.nix
View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "scmrepo";
version = "0.0.16";
version = "0.0.17";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,8 +22,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-gaZXQFZ1Vm8ruW42IXc6+fLA5856Oc0cGgtScwIr5f8=";
rev = "refs/tags/${version}";
hash = "sha256-OMmVEBbb3BQcxpAg6+goGITu8iuHzg+ZzVs+8UdRFrg=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/deadnix/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "deadnix";
version = "0.1.3";
version = "0.1.5";
src = fetchFromGitHub {
owner = "astro";
repo = "deadnix";
rev = "v${version}";
sha256 = "0ddnxmcr9fncgrqg1vvqcbx49c3lccdpb40h9rvzyldzy9xynzi7";
sha256 = "1fyagp6m6adwfcisi1zvs5dflcvrmpx4q1fr8pqzb93zv4m3ar84";
};
cargoSha256 = "19vgjv70vxgxssrxvdjwfl16bwdbdrpb2wzb3fg9vlz4fhbj2lv9";
cargoSha256 = "102akpvs2hvf5hl9rh5cspxzqly68wk7qhx0g1zhfp1ka58gnr4p";
meta = with lib; {
description = "Find and remove unused code in .nix source files";

76
pkgs/games/koules/default.nix Normal file
View File

@ -0,0 +1,76 @@
{ stdenv
, lib
, fetchurl
, fetchzip
, makeDesktopItem
, copyDesktopItems
, imake
, gccmakedep
, libX11
, libXext
, installShellFiles
}:
let
debian-extras = fetchzip {
url = "mirror://debian/pool/main/k/koules/koules_1.4-27.debian.tar.xz";
sha256 = "0bq1rr6vxqmx2k0dhyrqnwwfiw4h2ycbj576v66vwr0jaq5plil3";
};
in
stdenv.mkDerivation rec {
pname = "koules";
version = "1.4";
src = fetchurl {
url = "https://www.ucw.cz/~hubicka/koules/packages/${pname}${version}-src.tar.gz";
sha256 = "06x2wkpns14kii9fxmxbmj5lma371qj00hgl7fc5kggfmzz96vy3";
};
nativeBuildInputs = [ imake gccmakedep installShellFiles copyDesktopItems ];
buildInputs = [ libX11 libXext ];
# Debian maintains lots of patches for koules. Let's include all of them.
prePatch = ''
patches="$patches $(cat ${debian-extras}/patches/series | sed 's|^|${debian-extras}/patches/|')"
'';
postPatch = ''
# We do not want to depend on that particular font to be available in the
# xserver, hence substitute it by a font which is always available
sed -ie 's:-schumacher-clean-bold-r-normal--8-80-75-75-c-80-\*iso\*:fixed:' xlib/init.c
'';
preBuild = ''
cp xkoules.6 xkoules.man # else "make" will not succeed
sed -ie "s:^SOUNDDIR\s*=.*:SOUNDDIR=$out/lib:" Makefile
sed -ie "s:^KOULESDIR\s*=.*:KOULESDIR=$out:" Makefile
'';
installPhase = ''
runHook preInstall
install -Dm755 xkoules $out/bin/xkoules
install -Dm755 koules.sndsrv.linux $out/lib/koules.sndsrv.linux
install -m644 sounds/* $out/lib/
install -Dm644 Koules.xpm $out/share/pixmaps/koules.xpm
installManPage xkoules.6
runHook postInstall
'';
desktopItems = [ (makeDesktopItem {
desktopName = "Koules";
name = "koules";
exec = "xkoules";
icon = "koules";
comment = "Push your enemies away, but stay away from obstacles";
categories = [ "Game" "ArcadeGame" ];
}) ];
meta = with lib; {
description = "Fast arcade game based on the fundamental law of body attraction";
homepage = "https://www.ucw.cz/~hubicka/koules/English/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.iblech ];
};
}

4
pkgs/servers/dex/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "dex";
version = "2.31.0";
version = "2.31.1";
src = fetchFromGitHub {
owner = "dexidp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tr7rs2ymHpMEtNwvLhgEzp94wO/k/oY814NS0N4ONsg=";
sha256 = "sha256-4BmZpN3k1qDYLdkXm4AX73bX5hBiyLv0nVKYVwD/HCM=";
};
vendorSha256 = "sha256-l+/qjYokg5zHAFkKxtkdX49HqVW6kfz7OHqs6SRKDYg=";

6
pkgs/tools/admin/aliyun-cli/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.0.113";
version = "3.0.115";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aliyun";
repo = pname;
fetchSubmodules = true;
sha256 = "sha256-+ZbfWFAf7G5mwtSgfGe/oslqIbOqqiwdtP9mWx/3u4w=";
sha256 = "sha256-lWWycvzZaVoEzEHp392mEDGcrksC4Y9XjGZYeL9RY6s=";
};
vendorSha256 = "sha256-FQvBq8+80h7m271gjraV445ayWcpkemOtVswfmHzUM0=";
vendorSha256 = "sha256-f3GXkAvTe8rPFWCR5TM4mDK/VOQWt2lrZrfJ/Wvw8Uc=";
subPackages = [ "main" ];

6
pkgs/tools/admin/trivy/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "trivy";
version = "0.25.2";
version = "0.25.3";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yDoHDOPtPX5u8K2/fnj6dgqlI+WUCsuxbdKtb/UtIRQ=";
sha256 = "sha256-TRcGUjmhV5vP3c4VeGfRtV+Fcnl/09HIQ+ojfAFWdm8=";
};
vendorSha256 = "sha256-HZpGPCayrnayOg+3mB8Tw+5M2IfIpIvzP7qfY1OL7tk=";
vendorSha256 = "sha256-3rJj+LDHQPYpYsU52kldFFpgS7Ry1n5Kjy0IAK6q/vU=";
excludedPackages = "misc";

5
pkgs/tools/misc/go.rice/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "go.rice";
pname = "go-rice";
version = "1.0.2";
src = fetchFromGitHub {
@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "sha256-VlpdZcqg7yWUADN8oD/IAgAXVdzJeIeymx2Pu/7E21o=";
doCheck = false;
subPackages = [ "." "rice" ];
meta = with lib; {
@ -24,4 +22,3 @@ buildGoModule rec {
maintainers = with maintainers; [ blaggacao ];
};
}

8
pkgs/tools/security/fulcio/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "fulcio";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tCjFx9Ug8rO8cSxQb2vBG/MHSUJCx17lDeGnSGjZLcI=";
sha256 = "sha256-jcmjfNGruDhQPhVn5R2hdUr+d42qQnIVj8+CCX5HMMM=";
# 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.
leaveDotGit = true;
@ -20,11 +20,13 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorSha256 = "sha256-CmtsReP0JacgNyRqCrYZRONwR5eluymrQgsj/ukhYNQ=";
vendorSha256 = "sha256-WQ0MuNEJWCxKTjkyqA66bGPoMrS/7W/YTiGU3yd+Ge8=";
# install completions post-install
nativeBuildInputs = [ installShellFiles ];
excludedPackages = [ "federation" "test/prometheus" ];
ldflags = [
"-s"
"-w"

2
pkgs/top-level/all-packages.nix
View File

@ -31335,6 +31335,8 @@ with pkgs;
useProprietaryAssets = false;
};
koules = callPackage ../games/koules { };
leela-zero = libsForQt5.callPackage ../games/leela-zero { };
legendary-gl = python38Packages.callPackage ../games/legendary-gl { };