mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 13:00:23 +00:00
Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -88,28 +88,28 @@ let
|
||||
};
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2026.1.4.6"; # "Android Studio Quail 4 | 2026.1.4 RC 2"
|
||||
version = "2026.2.1.6"; # "Android Studio Rabbit 1 | 2026.2.1 RC 1"
|
||||
sources = {
|
||||
x86_64-linux = {
|
||||
sha256Hash = "sha256-e4lzCfGJq7PBx9qimChUi/NZWu3gWAOiONgUWrTXtgk=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.4.6/android-studio-quail4-rc2-linux.tar.gz";
|
||||
sha256Hash = "sha256-YXLN4O+SqnRhJpQd6lN74Re1vzdXh3JYFKqIdkRAx8w=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.2.1.6/android-studio-rabbit1-rc1-linux.tar.gz";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
sha256Hash = "sha256-KqD0LNcmMytDXmaTNIEsvrJRZzBCJ3V0mITlhBnFbf4=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/install/2026.1.4.6/android-studio-quail4-rc2-mac_arm.dmg";
|
||||
sha256Hash = "sha256-kdcw7G7t0opNj9Xcn86A9ty0pZ3RBV5Ll8omC0Nhxkg=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/install/2026.2.1.6/android-studio-rabbit1-rc1-mac_arm.dmg";
|
||||
};
|
||||
};
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2026.2.1.5"; # "Android Studio Rabbit 1 | 2026.2.1 Canary 5"
|
||||
version = "2026.2.2.1"; # "Android Studio Rabbit 2 | 2026.2.2 Canary 1"
|
||||
sources = {
|
||||
x86_64-linux = {
|
||||
sha256Hash = "sha256-Idrpclm4yiy86SP+hhItMSbquCM8R49NB9n/Q2LXkZc=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.2.1.5/android-studio-rabbit1-canary5-linux.tar.gz";
|
||||
sha256Hash = "sha256-m6E5gAI6hO2M5zf7nDQaQtnHmdimdXZsBYSKOVH4nbQ=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.2.2.1/android-studio-rabbit2-canary1-linux.tar.gz";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
sha256Hash = "sha256-l3S5eFmELeIL30Tn7QoevBfhWLqauZxHtM9FeahpyXk=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/install/2026.2.1.5/android-studio-rabbit1-canary5-mac_arm.dmg";
|
||||
sha256Hash = "sha256-HfIEtxeeDM5wOBn1lBV0aPP7iYe4Ih+RUC6F2culXao=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/install/2026.2.2.1/android-studio-rabbit2-canary1-mac_arm.dmg";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -34,16 +34,16 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-iHHWNyklaONMLSfapTIKOzyAX0H5QBTfzq++YTQYf84=";
|
||||
aarch64-linux = "sha256-5q4qiAePrceAEcS92nDFlmC1/iQrSqs0EoVWB3nFIxM=";
|
||||
aarch64-darwin = "sha256-Fu5c3bHqGSNOHyUW2gfVfgfXyrarRaVRXasHdlbLxl4=";
|
||||
armv7l-linux = "sha256-XZZbmaGUj0dkwTOXAo7W9L1815GOghHhltoOAfuNDjg=";
|
||||
x86_64-linux = "sha256-DJy86gcOmg/GLeXHj+4BqA+OMveK2mZNlzH2xRdQO34=";
|
||||
aarch64-linux = "sha256-1SM07NDHqmsbS/PDvfFlMKBLzgE8lfEG03L2Xg9uW8U=";
|
||||
aarch64-darwin = "sha256-kjCAvrwZTsF4wqBrYbyxODdndkBsI7i9Pk/DKG+Ry6I=";
|
||||
armv7l-linux = "sha256-3jVAei1IX2Ij7FY7z++22bui9yIEr2qZUXtQzgAmgq0=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.137.0";
|
||||
version = "1.139.1";
|
||||
|
||||
# The update server (update.code.visualstudio.com) expects the version path
|
||||
# segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
|
||||
@@ -51,7 +51,7 @@ let
|
||||
downloadVersion = lib.versions.pad 3 version;
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "645f29cc3176500b4b5762ba887cf2a7f0ffdf2c";
|
||||
rev = "04c0d99f4fb0d8afe6ce4f0c58e31e183ac3e4b1";
|
||||
in
|
||||
buildVscode {
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
@@ -84,7 +84,7 @@ buildVscode {
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
hash = "sha256-bf5KW7f0tQnALS6KbyWMzZE7kQaLVT0DmtaPKazmITY=";
|
||||
hash = "sha256-4s41uMC5DPIX/u6Yc6GcHi7kFM8BpZidZ8h+DvhBaJQ=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
imagemagick,
|
||||
jhead,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
@@ -11,18 +10,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "budgie-backgrounds";
|
||||
version = "3.0";
|
||||
version = "4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BuddiesOfBudgie";
|
||||
repo = "budgie-backgrounds";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-2E6+WDLIAwqiiPMJw+tLDCT3CnpboH4X0cB87zw/hBQ=";
|
||||
hash = "sha256-veUGYYUIHfz8MTaVNWaOkWl2byWEQhTSp9iikSPcHsw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
imagemagick
|
||||
jhead
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
libgtop,
|
||||
libgudev,
|
||||
libhandy,
|
||||
libjxl,
|
||||
libkrb5,
|
||||
libnma,
|
||||
libpulseaudio,
|
||||
@@ -148,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export GDK_PIXBUF_MODULE_FILE="${
|
||||
gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
];
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "drupal";
|
||||
version = "11.4.6";
|
||||
version = "11.4.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.drupalcode.org";
|
||||
owner = "project";
|
||||
repo = "drupal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zJ5bK94jmHDCBSndEwkR/2kHaN865nqoMv8NzXJZ7t4=";
|
||||
hash = "sha256-bVF5forQOEaXbriSxf6U1n/eQCwkMIHMvY4LwIx0fRE=";
|
||||
};
|
||||
|
||||
composerNoPlugins = false;
|
||||
vendorHash = "sha256-ydN7fRhs54ZdPEuD9UKuWvgql8O+JvUdR4VuqifM6KY=";
|
||||
vendorHash = "sha256-/mFF7HIjj3b/4zQRfGSD2FyPljoMNJWly6K4hc05uOE=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2026-09-04
|
||||
# Last updated: 2026-09-25
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
aarch64-darwin = {
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.7.1-arm64-mac.zip";
|
||||
hash = "sha512-PFWj+tHSZLCI/GuduHpFci/CTyxr6CT+OQHlVDc7DiI5BKwbNUfm/4IF2iwNfg5d5s5G+e/ZpJNxQUmfj+x26w==";
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.8.0-arm64-mac.zip";
|
||||
hash = "sha512-TT/oMY6F0tNzS9fyYybJDOdsLkDWTubAlVGRhm3V7cWaoR/6wpx7AhTLLZLidKGDVn55OFqHLAy0TBocVwkx+w==";
|
||||
};
|
||||
};
|
||||
aarch64-linux = {
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/linux/arm64/com.fastmail.Fastmail-1.7.0-arm64.AppImage";
|
||||
hash = "sha256-sS5xTsCOLrN9Ua2ew02ODKcNxkTfJlDMMZaIwRvofCI=";
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/linux/arm64/com.fastmail.Fastmail-1.8.0-arm64.AppImage";
|
||||
hash = "sha512-salt9b6hxkn+uW0QIlauGcobRua8ih2bYIgCR7otCQjhcUCz7SuLN8zryfM8Q+awNJ9p6RILrv5S0t2QFihPlA==";
|
||||
};
|
||||
};
|
||||
x86_64-linux = {
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.7.0.AppImage";
|
||||
hash = "sha256-1D7ZvNMV6VmPzoQNfUlmXakylx2iDyr+UhkWdgzZp1c=";
|
||||
url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.8.0.AppImage";
|
||||
hash = "sha512-t5Ygan37PcUpt2z4bAEpUbtEO4TlBM4QLkP2ycfhaBxQD9L/pJH4iWI+SL4emg4oWZSJk0GnehlWhCosayiIlQ==";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
gmp,
|
||||
gnutls,
|
||||
gnugrep,
|
||||
gnused,
|
||||
gpauth,
|
||||
gtk3,
|
||||
iproute2,
|
||||
@@ -29,6 +30,7 @@
|
||||
perl,
|
||||
pkg-config,
|
||||
systemd,
|
||||
unixtools,
|
||||
zlib,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
}:
|
||||
@@ -141,7 +143,9 @@ rustPlatform.buildRustPackage {
|
||||
coreutils
|
||||
gawk
|
||||
gnugrep
|
||||
gnused
|
||||
net-tools
|
||||
unixtools.ps
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
iproute2
|
||||
@@ -155,6 +159,17 @@ rustPlatform.buildRustPackage {
|
||||
substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \
|
||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||
|
||||
# The dispatcher skips dotfiles, so the .gpclient-nm-hook-wrapped
|
||||
# payload next to the wrapper is not run as a second script.
|
||||
wrapProgram "$out/lib/NetworkManager/dispatcher.d/gpclient-nm-hook" \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
coreutils
|
||||
gnugrep
|
||||
unixtools.ps
|
||||
]
|
||||
}"
|
||||
|
||||
install -Dm644 packaging/files/usr/share/applications/gpgui.desktop \
|
||||
$out/share/applications/gpgui.desktop
|
||||
substituteInPlace $out/share/applications/gpgui.desktop \
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libdwarf";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davea42";
|
||||
repo = "libdwarf-code";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-65jEnM+eJ7HnZlpEM2D67W0Xgb9B/aa4JhajowG0Z8o=";
|
||||
hash = "sha256-mO8fB369iS5l73iOB8zAqUjY8xl4PntV//2hRiirTtA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "qownnotes-tui";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "qownnotes";
|
||||
repo = "qownnotes-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-62EXnkooEAzczrIBNj8G6i/SLBbjotMUtZ86rNbNe7o=";
|
||||
hash = "sha256-Vh93ZKTXkYVdgAQB9e8b29LZvRPTM3FM60Nxkh/7/FI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-c4mZD7w2KSvWeYvAt+ISbCpPOuG1VwTS8xcOht3rdLM=";
|
||||
cargoHash = "sha256-ziHScxY1VQcL8UxbAR07BfZLx1SMRLgse4ukfL3waJ0=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rumdl";
|
||||
version = "0.2.73";
|
||||
version = "0.2.77";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "rvben";
|
||||
repo = "rumdl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ExIsl0JlEb8hylph8r1r4mx/hOyiLZVVutVxvfgMSrU=";
|
||||
hash = "sha256-3VOOsyaTMEXNX/Mar/eaGbLpm+GEpkMi4B+9m6TDCyA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lGTe+efabf3MtSfPCKlsbNQviCQH5DEmXlXDFOCQSgw=";
|
||||
cargoHash = "sha256-jXMF81Cj0J/R/1hn+PVS4WRVhbxQkx30TPh7ZpTCFeU=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin=rumdl"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchgit,
|
||||
fetchFromGitea,
|
||||
gnuradio,
|
||||
cmake,
|
||||
pkg-config,
|
||||
@@ -26,13 +26,18 @@
|
||||
|
||||
mkDerivation {
|
||||
pname = "gr-fosphor";
|
||||
version = "unstable-2024-03-23";
|
||||
version = "0-unstable-2024-03-23";
|
||||
|
||||
# It is a gitea instance, but its archive service doesn't work very well so
|
||||
# we can't use it.
|
||||
src = fetchgit {
|
||||
url = "https://gitea.osmocom.org/sdr/gr-fosphor.git";
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.osmocom.org";
|
||||
owner = "sdr";
|
||||
repo = "gr-fosphor";
|
||||
rev = "74d54fc0b3ec9aeb7033686526c5e766f36eaf24";
|
||||
# the host doesn't serve tarballs
|
||||
forceFetchGit = true;
|
||||
hash = "sha256-FBmH4DmKATl0FPFU7T30OrYYmxlSTTLm1SZpt0o1qkw=";
|
||||
};
|
||||
disabled = gnuradioOlder "3.9" || gnuradioAtLeast "3.11";
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
django,
|
||||
setuptools,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-admin-datta";
|
||||
version = "1.0.19";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-65fUrV4FIbuVvNX93rgOCMjz4CoozMHEEVpzJqtbhKY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ django ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "admin_datta" ];
|
||||
|
||||
meta = {
|
||||
description = "Modern template for Django that covers Admin Section";
|
||||
homepage = "https://appseed.us/product/datta-able/django";
|
||||
changelog = "https://github.com/app-generator/django-admin-datta/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ derdennisop ];
|
||||
};
|
||||
}
|
||||
@@ -196,6 +196,7 @@ mapAliases {
|
||||
discogs_client = throw "'discogs_client' has been renamed to/replaced by 'discogs-client'"; # Converted to throw 2025-10-29
|
||||
distutils_extra = throw "'distutils_extra' has been renamed to/replaced by 'distutils-extra'"; # Converted to throw 2025-10-29
|
||||
dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21
|
||||
django-admin-datta = throw "django-admin-datta has been removed because it is unmaintained"; # added 2026-09-19
|
||||
django-crispy-bootstrap3 = crispy-bootstrap3; # added 2025-06-11
|
||||
django-crispy-bootstrap4 = crispy-bootstrap4; # added 2025-06-11
|
||||
django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
|
||||
|
||||
@@ -4549,8 +4549,6 @@ self: super: with self; {
|
||||
# LTS with mainsteam support
|
||||
django = self.django_5;
|
||||
|
||||
django-admin-datta = callPackage ../development/python-modules/django-admin-datta { };
|
||||
|
||||
django-admin-sortable2 = callPackage ../development/python-modules/django-admin-sortable2 { };
|
||||
|
||||
django-agnocomplete = callPackage ../development/python-modules/django-agnocomplete { };
|
||||
|
||||
Reference in New Issue
Block a user