dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-11-04 18:01:04 +00:00 committed by GitHub
commit 870227bcb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/greenfoot/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "greenfoot";
version = "3.8.0";
version = "3.8.1";
src = fetchurl {
# We use the deb here. First instinct might be to go for the "generic" JAR
# download, but that is actually a graphical installer that is much harder
# to unpack than the deb.
url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb";
sha256 = "sha256-HDXmgLHS18VZVV+hCA0RgIrKRftOlV7t+fvE0pAHGjk=";
sha256 = "sha256-utGSAbP74O1t1iEoN0CwiZVc8HxdCxhozPPMwQCtkEE=";
};
nativeBuildInputs = [ dpkg wrapGAppsHook ];

2
pkgs/applications/graphics/fiji/default.nix
View File

@ -71,6 +71,6 @@ stdenv.mkDerivation rec {
binaryNativeCode
];
license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ];
maintainers = with maintainers; [ zane ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/servers/osmocom/osmo-iuh/default.nix
View File

@ -17,13 +17,13 @@ in
stdenv.mkDerivation rec {
pname = "osmo-iuh";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-iuh";
rev = version;
hash = "sha256-AwLLfG+5JgvFSBddzyUQdPDFZOX1uQyDSyr4O/wTlgs=";
hash = "sha256-rAU2+NxD+j2jntZ7dHvakv2aTsfzAg0+SFDHtSJNpn8=";
};
prePatch = ''

4
pkgs/servers/sql/mysql/8.0.x.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mysql";
version = "8.0.34";
version = "8.0.35";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0=";
hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI=";
};
nativeBuildInputs = [ bison cmake pkg-config ]

3
pkgs/tools/graphics/escrotum/default.nix
View File

@ -1,4 +1,5 @@
{ lib, python3Packages, fetchFromGitHub
, ffmpeg-full
, gtk3
, pango
, gobject-introspection
@ -33,6 +34,8 @@ with python3Packages; buildPythonApplication {
outputs = [ "out" "man" ];
makeWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}"];
postInstall = ''
mkdir -p $man/share/man/man1
cp man/escrotum.1 $man/share/man/man1/