mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
4ad6839f0c
@ -258,6 +258,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- The `pnpm` package has be updated to from version 7.29.1 to version 8.1.1 and Node.js 14 support has been discontinued (though, there are workarounds if Node.js 14 is still required)
|
||||
- Migration instructions: ["Before updating pnpm to v8 in your CI, regenerate your pnpm-lock.yaml. To upgrade your lockfile, run pnpm install and commit the changes. Existing dependencies will not be updated; however, due to configuration changes in pnpm v8, some missing peer dependencies may be added to the lockfile and some packages may get deduplicated. You can commit the new lockfile even before upgrading Node.js in the CI, as pnpm v7 already supports the new lockfile format."](https://github.com/pnpm/pnpm/releases/tag/v8.0.0)
|
||||
|
||||
- The `zplug` package changes its output path from `$out` to `$out/share/zplug`. Users should update their dependency on `${pkgs.zplug}/init.zsh` to `${pkgs.zplug}/share/zplug/init.zsh`.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.05-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lscolors";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-rs/qv6zmSHy2FFiPSgGzxAV/r0SqK9vnfwnLj45WY4I=";
|
||||
sha256 = "sha256-YVKs/1R//oKYBSSGnj6UMFo5zDp5O3QDDdkDKF4ICBk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-WDvflAb56l+UkrxeQQZrloxlaK/mZavT9sA+VOWDW5Q=";
|
||||
cargoHash = "sha256-EJdjSFgvvwH5beW+aD1KT5G9bpW/8mdi+7c27KSkZjo=";
|
||||
|
||||
# setid is not allowed in the sandbox
|
||||
checkFlags = [ "--skip=tests::style_for_setid" ];
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minder";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phase1geo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5k6a7/49iqtPt7il1/LlCHlQsilXRcGAJSAkJ3BBowU=";
|
||||
sha256 = "sha256-JKbz7UUl5iQxquBH705WBN9T4q7OondTypnEUGfqBWY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "14.0.0";
|
||||
version = "14.1.2";
|
||||
|
||||
twemojiSrc = fetchFromGitHub {
|
||||
name = "twemoji";
|
||||
owner = "twitter";
|
||||
owner = "jdecked";
|
||||
repo = "twemoji";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ar6rBYudMIMngMVe/IowDV3X8wA77JBA6g0x/M7YLMg=";
|
||||
sha256 = "sha256-UQ4PwO4D1kw7JOMf6xSaRBfT822KwrvWBPDmaQjkRVQ=";
|
||||
};
|
||||
|
||||
pythonEnv =
|
||||
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
This font uses Google’s CBDT format making it work on Android and Linux graphical stack.
|
||||
'';
|
||||
homepage = "https://twemoji.twitter.com/";
|
||||
homepage = "https://github.com/jdecked/twemoji";
|
||||
# In noto-emoji-fonts source
|
||||
## noto-emoji code is in ASL 2.0 license
|
||||
## Emoji fonts are under OFL license
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-camera";
|
||||
version = "1.4.8";
|
||||
version = "1.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-p2RCetx1lgLonXZaC3umE+nDgZnp64o3iR2MgQhbisM=";
|
||||
sha256 = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ=";
|
||||
};
|
||||
|
||||
# QLibrary and dlopen work with LD_LIBRARY_PATH
|
||||
|
||||
@ -50,13 +50,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "43.4";
|
||||
version = "43.5";
|
||||
|
||||
outputs = [ "out" "dev" "man" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "FiU2cxEaLsyW/I0tFfrdobVU0B3CioMEE11J1rqHsUA=";
|
||||
sha256 = "/JAP4ahA2aeTyOLSDUTJCqCH1fv9x5Su5wluHYoJZxo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -66,14 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
|
||||
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
|
||||
})
|
||||
|
||||
# GLib 2.76 switches from using its own slice allocator to using the system malloc instead.
|
||||
# This makes dragging window between workspace in multitasking view crashes Pantheon's Gala.
|
||||
# Inspiration https://github.com/mate-desktop/mate-desktop/pull/538
|
||||
# Backtrace https://github.com/elementary/gala/issues/1580
|
||||
# Upstream report https://gitlab.gnome.org/GNOME/mutter/-/issues/2495
|
||||
# The patch will not apply on 44.0+, make sure this is fixed when trying to clean this up.
|
||||
./glib-2-76-gala-crash.patch
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
|
||||
index d34c8f59f..8835a6a33 100644
|
||||
--- a/clutter/clutter/clutter-actor.c
|
||||
+++ b/clutter/clutter/clutter-actor.c
|
||||
@@ -12304,7 +12304,7 @@ clutter_actor_run_actions (ClutterActor *self,
|
||||
ClutterEventPhase phase)
|
||||
{
|
||||
ClutterActorPrivate *priv;
|
||||
- const GList *actions, *l;
|
||||
+ const GList *actions, *l, *next;
|
||||
gboolean retval = CLUTTER_EVENT_PROPAGATE;
|
||||
|
||||
priv = self->priv;
|
||||
@@ -12313,9 +12313,10 @@ clutter_actor_run_actions (ClutterActor *self,
|
||||
|
||||
actions = _clutter_meta_group_peek_metas (priv->actions);
|
||||
|
||||
- for (l = actions; l; l = l->next)
|
||||
+ for (l = actions; l; l = next)
|
||||
{
|
||||
ClutterAction *action = l->data;
|
||||
+ next = l->next;
|
||||
ClutterEventPhase action_phase;
|
||||
|
||||
action_phase = clutter_action_get_phase (action);
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, gettext
|
||||
, meson
|
||||
@ -11,15 +12,24 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "elementary-gtk-theme";
|
||||
version = "7.1.0";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "stylesheet";
|
||||
rev = version;
|
||||
sha256 = "sha256-AFiREZ4pDIwQ4OeZDIHEJUNSeUsMjAlDd5h0pB0ilNw=";
|
||||
sha256 = "sha256-ZR0FJ8DkPlO1Zatvxv3NghAVBPo2j+1m0k4C+gvYPVA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Headerbars: fix missing default-decoration
|
||||
# https://github.com/elementary/stylesheet/pull/1258
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/stylesheet/commit/9cea2383bec8f90d25f1e9b854b5221737487521.patch";
|
||||
sha256 = "sha256-6komROS4+nxwoGoKoiDmnrTfLNZAvnTU6hIEOQQfmxc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
|
||||
@ -45,7 +45,7 @@ let
|
||||
buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903
|
||||
disableBootstrap' = disableBootstrap && !langFortran;
|
||||
disableBootstrap' = disableBootstrap && !langFortran && !langGo;
|
||||
|
||||
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
|
||||
crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
|
||||
|
||||
@ -12,7 +12,7 @@ in
|
||||
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
|
||||
# This is a separate phase because gcc assembles its phase scripts
|
||||
# in bash instead of nix (we should fix that).
|
||||
preFixupPhases = (previousAttrs.preFixupPhases or []) ++ [ "preFixupLibGccPhase" ];
|
||||
preFixupPhases = (previousAttrs.preFixupPhases or []) ++ lib.optionals ((!langC) || enableLibGccOutput) [ "preFixupLibGccPhase" ];
|
||||
preFixupLibGccPhase =
|
||||
# delete extra/unused builds of libgcc_s in non-langC builds
|
||||
# (i.e. libgccjit, gnat, etc) to avoid potential confusion
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hamlib";
|
||||
version = "4.5.2";
|
||||
version = "4.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Wg+eky/+LTlx4HtUSqYr7D5JTnP/HOPKM/oNiOGZsGE=";
|
||||
sha256 = "sha256-YByJ8y7SJelSet49ZNDQXSMgLAWuIf+nflnXDuRZf80=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.3";
|
||||
version = "2.8.7";
|
||||
pname = "tinygltf";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syoyo";
|
||||
repo = "tinygltf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6rfC5nXGseXtqh2IonZto+DM8ZV/t5U1ulZ3GFHwoeg=";
|
||||
hash = "sha256-uQlv+mUWnqUJIXnPf2pVuRg1akcXAfqyBIzPPmm4Np4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
33
pkgs/development/python-modules/binary/default.nix
Normal file
33
pkgs/development/python-modules/binary/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "binary";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bsAQ5Y9zMevIvJY42+bGbWNd5g1YGLByO+9N6tDsKKY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "binary" "binary.core" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Easily convert between binary and SI units (kibibyte, kilobyte, etc.)";
|
||||
homepage = "https://github.com/ofek/binary";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@ -18,6 +18,7 @@
|
||||
, pythonOlder
|
||||
, pretend
|
||||
, libiconv
|
||||
, libxcrypt
|
||||
, iso8601
|
||||
, py
|
||||
, pytz
|
||||
@ -56,7 +57,8 @@ buildPythonPackage rec {
|
||||
] ++ (with rustPlatform; [ rust.cargo rust.rustc ]);
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
++ lib.optionals stdenv.isDarwin [ Security libiconv ]
|
||||
++ lib.optionals (pythonOlder "3.9") [ libxcrypt ];
|
||||
|
||||
propagatedBuildInputs = lib.optionals (!isPyPy) [
|
||||
cffi
|
||||
|
||||
@ -1336,6 +1336,10 @@ let
|
||||
rhdf5= old.rhdf5.overrideAttrs (attrs: {
|
||||
patches = [ ./patches/rhdf5.patch ];
|
||||
});
|
||||
|
||||
textshaping = old.textshaping.overrideAttrs (attrs: {
|
||||
env.NIX_LDFLAGS = "-lfribidi -lharfbuzz";
|
||||
});
|
||||
};
|
||||
in
|
||||
self
|
||||
|
||||
@ -2,61 +2,61 @@
|
||||
"4.14": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.312-hardened1.patch",
|
||||
"sha256": "1ysbbd43zgh1zbk99kpzwwa42ywprj2j4bwy87l58vlwcd2xf53r",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.312-hardened1/linux-hardened-4.14.312-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.313-hardened1.patch",
|
||||
"sha256": "0qpf9chiydj6dcka1lf6qdx462wq0salxac3kkl32l33karax292",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.313-hardened1/linux-hardened-4.14.313-hardened1.patch"
|
||||
},
|
||||
"sha256": "03bwrnm7z8jxxn681dd5jffrj76l14ngkcccfgbg1p4a0471q436",
|
||||
"version": "4.14.312"
|
||||
"sha256": "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76",
|
||||
"version": "4.14.313"
|
||||
},
|
||||
"4.19": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.280-hardened1.patch",
|
||||
"sha256": "0ayl7hcwf4j763gqzrd79kp7cyq7m5v6ar6znfi57ssqdrwq494l",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.280-hardened1/linux-hardened-4.19.280-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.281-hardened1.patch",
|
||||
"sha256": "0qhf0835zwmj0z2654bhyc6zww68g8ng4ghg5ivw2zcfv6yssv17",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.281-hardened1/linux-hardened-4.19.281-hardened1.patch"
|
||||
},
|
||||
"sha256": "1xmg9p3ky75n5q894f522s8nwcmbd5c15nmjr0n96m6xzag3kd7w",
|
||||
"version": "4.19.280"
|
||||
"sha256": "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0",
|
||||
"version": "4.19.281"
|
||||
},
|
||||
"5.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.177-hardened1.patch",
|
||||
"sha256": "19ic849ph32nca206ngcf11v52k60z4lwyssaqdnhbikv3z1zpfj",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.177-hardened1/linux-hardened-5.10.177-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.178-hardened1.patch",
|
||||
"sha256": "142ym9z6c9bcq2hpv2ik6xsjlvyyvw3vx8ggp4a67zwv6apg48v3",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.178-hardened1/linux-hardened-5.10.178-hardened1.patch"
|
||||
},
|
||||
"sha256": "0waml6svj07b7f8yb1kzrflqlf61x4kcqbgsr372s484m3z628lz",
|
||||
"version": "5.10.177"
|
||||
"sha256": "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs",
|
||||
"version": "5.10.178"
|
||||
},
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.107-hardened1.patch",
|
||||
"sha256": "1rd0lh9jdr2jm3aa91cax6m2fkmnhx2994gqwcnp1mqsy0bi9yh9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.107-hardened1/linux-hardened-5.15.107-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.108-hardened1.patch",
|
||||
"sha256": "1qfmx640b2s10q3sz0lcn1fsfbhklg8l4bzahrsdq6gkvsy9lyxn",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.108-hardened1/linux-hardened-5.15.108-hardened1.patch"
|
||||
},
|
||||
"sha256": "1a5gqpxmzls5mp4a0cw10ldrps4pvbn19nzfri91ys25j1v0wdqr",
|
||||
"version": "5.15.107"
|
||||
"sha256": "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb",
|
||||
"version": "5.15.108"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.240-hardened1.patch",
|
||||
"sha256": "0z64r2zs1swby2ws88xd1wy7dp83gamkk09asncc7k51zr9awraf",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.240-hardened1/linux-hardened-5.4.240-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.241-hardened1.patch",
|
||||
"sha256": "1nksqvc1ql42v92bfp26yyczvzslzl73mhnfc83j6cayqx8dw59z",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.241-hardened1/linux-hardened-5.4.241-hardened1.patch"
|
||||
},
|
||||
"sha256": "0ihf0rqhx7dav3k3igk29962sscb1xyniy2gx8chyllprr0z126w",
|
||||
"version": "5.4.240"
|
||||
"sha256": "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z",
|
||||
"version": "5.4.241"
|
||||
},
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened2",
|
||||
"name": "linux-hardened-6.1.24-hardened2.patch",
|
||||
"sha256": "1bjcjq0gqvhknryq97qj1a6q3fi71pql23knvs0c42k4vknfih9q",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.24-hardened2/linux-hardened-6.1.24-hardened2.patch"
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.1.25-hardened1.patch",
|
||||
"sha256": "1s9fx4nznmabg7b19qm7nwhpgdvin4f2gxd8f27zh7anbv9na4x7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.25-hardened1/linux-hardened-6.1.25-hardened1.patch"
|
||||
},
|
||||
"sha256": "0135aj8asplpxqr48hwdmwynx8n8hzhdgh55yl8r0n1kivisgrma",
|
||||
"version": "6.1.24"
|
||||
"sha256": "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb",
|
||||
"version": "6.1.25"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.313";
|
||||
version = "4.14.314";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0k2j856niappvkp9m1wxr87xvbwdzdy03mbcj827kmpjd9gdca76";
|
||||
sha256 = "0lwiykv2ci7lrjvvykbiqavzzizdkf8xxqlybixi9l1as7q02v47";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.281";
|
||||
version = "4.19.282";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "13nwzsh3h634450k37pxdca5j8vr3qswx7k79bs2999xp2js9pf0";
|
||||
sha256 = "02z20879xl4ya957by1p35vi1a7myzxwiqd9cnvm541sgnci99a3";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.178";
|
||||
version = "5.10.179";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1bx8wws9gvksg1c1af29nm03jjz2f5a5sq9hzc00ymjyf7isvkqs";
|
||||
sha256 = "0abylcqbzpxxh45kmvd9i2cig64aajz87j5c8vm3w1ab2mf49g8v";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.15.108";
|
||||
version = "5.15.109";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1fj38bvsyr9g89qr8pcjrp0kaq44g301x46gyjibq73gljnnkswb";
|
||||
sha256 = "06kpqpmbp4gpsx1yqcznmbn41wq82wmza0p3l9l00j1wpsy4nv06";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.241";
|
||||
version = "5.4.242";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0z7api3qcjrd6w7fva7k6fj4zx17mg5ibn28a6qbgy27dyny1h7z";
|
||||
sha256 = "0a7wfi84p74qsnbj1vamz4qxzp94v054jp1csyfl0blz3knrlbql";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1.25";
|
||||
version = "6.1.26";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "149h95r5msvqah868zd36y92ls9h41cr1rb5vzinl20mxdn46wnb";
|
||||
sha256 = "0461ckgh9qm1pj9xyi61cvawqpavn2sb44wjx5g4mmkrm11w3p6z";
|
||||
};
|
||||
# TODO: possible to remove after any rebuild, e.g. after update.
|
||||
extraConfig = lib.optionalString (buildPackages.stdenv.system == "x86_64-linux") "\n";
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.2.12";
|
||||
version = "6.2.13";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "1j6cn1ifmcqfqvxp9h10y8yfxi918yzl3yjbf96gmb9p4ysldqf7";
|
||||
sha256 = "0xz507nzslgidq7pwnfnsawvrn30apv4mmiapcc4p0v8wcafvpf7";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "19172";
|
||||
sha256 = "18r6p1zg7af7vpij1kna2i2w82xb0c8qrbbr9bfz6bcj8fqv8l2z";
|
||||
rev = "19204";
|
||||
sha256 = "1cxg2bslskjby11mxqv71w701217i1s9yj73ih3hjzxs6hkv9r0v";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -52,7 +52,7 @@ let
|
||||
|
||||
extraMeta = {
|
||||
branch = lib.versions.majorMinor version;
|
||||
maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu ];
|
||||
maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu shawn8901 ];
|
||||
description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
|
||||
@ -12,20 +12,20 @@ in
|
||||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.81.0";
|
||||
version = "1.82.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zOpjJSzQNgWQy52GjwR1zy3oaMRTxP92T3hNaYhmcCs=";
|
||||
hash = "sha256-j2lsdLYN5LqnIevUkD85i1XNIJa/Vpc1NHhIf2djlis=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-s/zq8VGBdIQu/Q/2gJrLFtZJ+lsTyK+2fr9RYhBTbKA=";
|
||||
hash = "sha256-iEPfYZd8RWlG5z8BbzESD9O0QV60EBiIIaxm9skt8Uc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.64.0";
|
||||
version = "2.66.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/5ozeabGqFpEfBi2WVRHUpaSwQjvuq8RRw2hNDp8j34=";
|
||||
hash = "sha256-sk0t/oy8YsTcYSMKtSsC3apGp8LNa9AUggHrHKd75pw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
|
||||
dontPatch = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r $src/* $out/
|
||||
mkdir -p $out/share/zplug
|
||||
cp -r $src/{autoload,base,bin,init.zsh,misc} $out/share/zplug/
|
||||
mkdir -p $out/share/man
|
||||
cp -r $src/doc/man/* $out/share/man/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zsh-forgit";
|
||||
version = "23.03.0";
|
||||
version = "23.04.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
sha256 = "sha256-merUZ0IQ/qmDkquGFjKvc4vJBj4Ff62JpWYOB67lAVY=";
|
||||
sha256 = "sha256-3lvYIuzuJw0CQlaAQG6hAyfUgSXM+3BOmKRVDNFUN/U=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -1286,6 +1286,8 @@ self: super: with self; {
|
||||
|
||||
bimmer-connected = callPackage ../development/python-modules/bimmer-connected { };
|
||||
|
||||
binary = callPackage ../development/python-modules/binary { };
|
||||
|
||||
binaryornot = callPackage ../development/python-modules/binaryornot { };
|
||||
|
||||
bincopy = callPackage ../development/python-modules/bincopy { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user