nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 03:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-08 00:15:24 +00:00
committed by GitHub
parent b8c57a2b1a d8bb6c681c
commit ef7b01c875
11 changed files with 1461 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde/angelfish.nix
View File

@@ -22,7 +22,7 @@
, srcs
# provided as callPackage input to enable easier overrides through overlays
, cargoSha256 ? "sha256-whMfpElpFB7D+dHHJrbwINFL4bVpHTlcZX+mdBfiqEE="
, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A="
}:
mkDerivation rec {

2
pkgs/applications/kde/fetch.sh
View File

@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.1/src -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.3/src -A '*.tar.xz' )

2048
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

810
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

12
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "115.0";
version = "115.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "ed5d150e4dfdc01026beb3ae502a0b04321dd130084fdef63afce79a8a7a4898741d08f77716ba720c24f31b9c732c00ad0f1cd408b35b5eb6601a10014fb1a2";
sha512 = "4368b3fa4ad4eb65752ab706f19175758bfa202c51a4c31d6512ab8e4f19dfdd0bd6fb8d845990d3c0aaad0e96a5c86e4ef699149ba2630c7a3c7dc4a5bc509c";
};
meta = {
@@ -29,11 +29,11 @@
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
version = "115.0b9";
version = "116.0b2";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "26e030143c09daef8fcdde55ebd020828025694d354e5f1e51308275af07b4c44aef325bb74e5e289b89d469822b2380a4abf47103972f46f12dfd9ac8fad830";
sha512 = "108ff803704442cb0e7d1dd2044b17d96f5bc2ccca692d8603084afcf2805b1f4be33a2711136a80538c5b04cb1d719bd46528482e1591bb2eeda0d792727d57";
};
meta = {
@@ -56,12 +56,12 @@
firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition";
version = "115.0b9";
version = "116.0b2";
applicationName = "Mozilla Firefox Developer Edition";
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "8d2a0dc2c64f8fc846077165ea0c97cae04a85db9ffcd23fbf933b25f165ecd85727ba2f432842f2d2f41c5b5bef5eb4ae2536d8492888c334aba0dcec278c47";
sha512 = "8e186aa7d74b57341589a9737c779267874445ef38a7f32a9b9093694d411a3a2c38b723fb7c676bb69c666ad34c82230900fc690ecc306e9d59150622163bc2";
};
meta = {

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

@@ -48,6 +48,8 @@ buildPythonPackage rec {
platforms = platforms.linux;
license = with licenses; [ gpl3 lgpl3 ];
maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members;
broken = true;
# The generated files in the tarball aren't compatible with python 3.11
# See https://sourceforge.net/p/enlightenment/mailman/message/37794291/
broken = python.pythonAtLeast "3.11";
};
}

1
pkgs/os-specific/linux/ax99100/default.nix
View File

@@ -28,6 +28,7 @@ stdenv.mkDerivation
./kernel-6.1-set_termios-const-ktermios.patch
] ++ (lib.optional (lib.versionAtLeast kernel.version "6.2") [
./kernel-6.2-fix-pointer-type.patch
./kernel-6.4-fix-define-semaphore.patch
]);
patchFlags = [ "-p0" ];

14
pkgs/os-specific/linux/ax99100/kernel-6.4-fix-define-semaphore.patch Normal file
View File

@@ -0,0 +1,14 @@
--- ax99100_sp.c
+++ ax99100_sp.c
@@ -2670,8 +2670,10 @@ static void serial99100_dma_tx_tasklet (unsigned long param)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
static DECLARE_MUTEX(serial99100_sem);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
static DEFINE_SEMAPHORE(serial99100_sem);
+#else
+static DEFINE_SEMAPHORE(serial99100_sem, 1);
#endif
static struct uart_driver starex_serial_driver = {

4
pkgs/servers/computing/slurm/default.nix
View File

@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "23.02.2.1";
version = "23.02.3.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-UWDtq4JSVaxiYOdplava9XUzFdMjEMQ4j8BCzVK8Ve0=";
sha256 = "sha256-YMm8a7uyZpPEuWQcgddX+0Me+ndgbYoDnC+sbmN/Hh8=";
};
outputs = [ "out" "dev" ];

4
pkgs/servers/web-apps/mediawiki/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediawiki";
version = "1.39.3";
version = "1.39.4";
src = fetchurl {
url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
hash = "sha256-41dpNDh2r0JJbaQ64vRyJPuMd5uPRXBcQUfG/zUizB0=";
hash = "sha256-nZW3xokAQ42H8BGRt8ZRJlm5KaBr9n8IqFjsLVEj4/U=";
};
postPatch = ''

4
pkgs/tools/misc/yt-dlp/default.nix
View File

@@ -22,11 +22,11 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2023.6.22";
version = "2023.7.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-7WqLjgrQikVA1K+g/Qin+YACLHm5CBvZ5j3cAK7u5ag=";
sha256 = "sha256-y1g3OGnIzLUDR0b5HPzNbSXqaXCQ39b5PpA01R60rtI=";
};
propagatedBuildInputs = [