mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge remote-tracking branch 'origin/master' into haskell-updates
This commit is contained in:
sternenseemann
commit
617b53c75f
@ -1319,10 +1319,10 @@
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
A new option
|
||||
<literal>boot.initrd.extraModprobeConfig</literal> has been
|
||||
added which can be used to configure kernel modules that are
|
||||
loaded in the initrd.
|
||||
The options <literal>boot.extraModprobeConfig</literal> and
|
||||
<literal>boot.blacklistedKernelModules</literal> now also take
|
||||
effect in the initrd by copying the file
|
||||
<literal>/etc/modprobe.d/nixos.conf</literal> into the initrd.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
||||
@ -491,7 +491,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
|
||||
|
||||
- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
|
||||
- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.
|
||||
|
||||
- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.
|
||||
|
||||
|
||||
@ -34,23 +34,6 @@ with lib;
|
||||
type = types.lines;
|
||||
};
|
||||
|
||||
boot.initrd.extraModprobeConfig = mkOption {
|
||||
default = "";
|
||||
example =
|
||||
''
|
||||
options zfs zfs_arc_max=1073741824
|
||||
'';
|
||||
description = ''
|
||||
Does exactly the same thing as
|
||||
<option>boot.extraModprobeConfig</option>, except
|
||||
that the generated <filename>modprobe.conf</filename>
|
||||
file is also included in the initrd.
|
||||
This is useful for setting module options for kernel
|
||||
modules that are loaded during early boot in the initrd.
|
||||
'';
|
||||
type = types.lines;
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -67,9 +50,6 @@ with lib;
|
||||
'')}
|
||||
${config.boot.extraModprobeConfig}
|
||||
'';
|
||||
environment.etc."modprobe.d/nixos-initrd.conf".text = ''
|
||||
${config.boot.initrd.extraModprobeConfig}
|
||||
'';
|
||||
environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
|
||||
|
||||
environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf";
|
||||
|
||||
@ -338,9 +338,6 @@ let
|
||||
{ object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
|
||||
symlink = "/etc/mdadm.conf";
|
||||
}
|
||||
{ object = config.environment.etc."modprobe.d/nixos-initrd.conf".source;
|
||||
symlink = "/etc/modprobe.d/nixos-initrd.conf";
|
||||
}
|
||||
{ object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
|
||||
src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
|
||||
preferLocalBuild = true;
|
||||
|
||||
@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ luc65r ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "moonlight";
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ let
|
||||
|
||||
meta = with lib; {
|
||||
inherit description;
|
||||
homepage = "https://github.com/supermerili/SuperSlicer";
|
||||
homepage = "https://github.com/supermerill/SuperSlicer";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ cab404 moredread ];
|
||||
mainProgram = "superslicer";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kn";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knative";
|
||||
repo = "client";
|
||||
rev = "knative-v${version}";
|
||||
sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY=";
|
||||
sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -772,12 +772,12 @@
|
||||
},
|
||||
"oci": {
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oci",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.67.0",
|
||||
"sha256": "sha256-kgnyGLF6UbWRbrjXDkh7y11jx4JO3hFo7/qdJzwX0rU=",
|
||||
"rev": "v4.68.0",
|
||||
"sha256": "sha256-f1Nk5NurQvJuGyGrZQnZIXIpaH1qFAX+oTBNan6rORI=",
|
||||
"vendorSha256": null,
|
||||
"version": "4.67.0"
|
||||
"version": "4.68.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40=";
|
||||
sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.10.6",
|
||||
"version": "1.10.7",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": "1.10.6",
|
||||
"desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=",
|
||||
"version": "1.10.7",
|
||||
"desktopSrcHash": "HkGny9t8dNzVGyyqgr4tABbFZgWV4xqGZt9xH4ejkew=",
|
||||
"desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0",
|
||||
"webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r"
|
||||
"webHash": "0gim79a1zpfc56ca5fndp2whmlv9jz1s32z666i268xppn4z53k1"
|
||||
}
|
||||
|
||||
@ -17,10 +17,10 @@ in
|
||||
mkFranzDerivation' rec {
|
||||
pname = "ferdi";
|
||||
name = "Ferdi";
|
||||
version = "5.7.0";
|
||||
version = "5.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
|
||||
sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c=";
|
||||
sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o=";
|
||||
};
|
||||
extraBuildInputs = [ xorg.libxshmfence ];
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, kconfig
|
||||
, kdbusaddons
|
||||
, ki18n
|
||||
, kio
|
||||
, kirigami2
|
||||
, kitemmodels
|
||||
, knotifications
|
||||
@ -16,23 +17,25 @@
|
||||
, libquotient
|
||||
, libsecret
|
||||
, olm
|
||||
, qcoro
|
||||
, qqc2-desktop-style
|
||||
, qtgraphicaleffects
|
||||
, qtkeychain
|
||||
, qtmultimedia
|
||||
, qtquickcontrols2
|
||||
, sonnet
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "neochat";
|
||||
version = "1.2";
|
||||
version = "22.02";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "network";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I=";
|
||||
sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
|
||||
@ -41,6 +44,7 @@ mkDerivation rec {
|
||||
cmark
|
||||
kconfig
|
||||
kdbusaddons
|
||||
kio
|
||||
ki18n
|
||||
kirigami2
|
||||
kitemmodels
|
||||
@ -50,11 +54,13 @@ mkDerivation rec {
|
||||
libquotient
|
||||
libsecret
|
||||
olm
|
||||
qcoro
|
||||
qtgraphicaleffects
|
||||
qtkeychain
|
||||
qtmultimedia
|
||||
qtquickcontrols2
|
||||
qqc2-desktop-style
|
||||
sonnet
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monitor";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stsdc";
|
||||
repo = "monitor";
|
||||
rev = version;
|
||||
sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7";
|
||||
sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/stsdc/monitor";
|
||||
maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "com.github.stsdc.monitor";
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,12 +16,12 @@ with lib;
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.16.3";
|
||||
version = "1.16.4";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-kT87CV/P1MUBLRetzYdIsIGVDjp9F6zmD2ovmcmy4Ys=";
|
||||
sha256 = "sha256-7zlreX05pkhn381FMgQ8Nj3OP+BUr6o3u5f4ouo/Khg=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.23.1";
|
||||
version = "1.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A59Bgt0u8jzpTijT5vcO8JREL7Elx1mWnwddAuRHn5c=";
|
||||
sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -128,8 +128,13 @@ let
|
||||
|
||||
# If the target package is in a workspace, or if it's the top-level
|
||||
# crate, we should find the crate path using `cargo metadata`.
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
|
||||
# Some packages do not have a Cargo.toml at the top-level,
|
||||
# but only in nested directories.
|
||||
# Only check the top-level Cargo.toml, if it actually exists
|
||||
if [[ -f $tree/Cargo.toml ]]; then
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
|
||||
${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path')
|
||||
fi
|
||||
|
||||
# If the repository is not a workspace the package might be in a subdirectory.
|
||||
if [[ -z $crateCargoTOML ]]; then
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57";
|
||||
sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg=";
|
||||
};
|
||||
libuvc-src = fetchgit {
|
||||
libuvc-src = fetchFromGitHub {
|
||||
owner = "libuvc";
|
||||
repo = "libuvc";
|
||||
rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837";
|
||||
|
||||
@ -5,15 +5,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "durden";
|
||||
version = "0.6.1+date=2021-10-17";
|
||||
version = "0.6.1+date=2022-03-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = pname;
|
||||
rev = "5fb8b0f9bc2952ed9cf7dc20a1c5c0cc44c02ff1";
|
||||
hash = "sha256-+EIsrCkMe9MrUQOCh0R+rsDg/Rqs3iQWO0GZCgZQ+No=";
|
||||
rev = "fec2a1051500df28becce188d932645743091efa";
|
||||
hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@ -5,15 +5,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pipeworld";
|
||||
version = "0.pre+date=2021-11-26";
|
||||
version = "0.pre+date=2021-12-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = pname;
|
||||
rev = "9f816db154ca5c54af952ad11c2186ccac5bdd2d";
|
||||
hash = "sha256-uwnrRsMP0RLEGr2mEVQ6kEtV/c6t5qSCHY0ynywPzkw=";
|
||||
rev = "c653414670cafb0c73a57492aa3d9510460b16a9";
|
||||
hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prio";
|
||||
version = "0.pre+unstable=2018-09-13";
|
||||
version = "0.pre+date=2018-09-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@ -38,23 +38,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xarcan";
|
||||
version = "0.6.0+unstable=2021-06-14";
|
||||
version = "0.6.0+date=2021-08-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "letoram";
|
||||
repo = pname;
|
||||
rev = "98d28a5f2c6860bb191fbc1c9e577c18e4c9a9b7";
|
||||
hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4=";
|
||||
rev = "e40f0176e495ffdad6e7405c58378df6532eb70d";
|
||||
hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with meson 0.60
|
||||
(fetchpatch {
|
||||
url = "https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05.patch";
|
||||
sha256 = "sha256-tSQmNy1Id6nDIN+03dc1+rEEF8fMq0yJBiscNM60xic=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@ -122,6 +114,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, fetchurl
|
||||
@ -70,6 +71,14 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
|
||||
# Fix build with new meson
|
||||
# plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments.
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch";
|
||||
sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ=";
|
||||
})
|
||||
# meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";
|
||||
sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";
|
||||
|
||||
@ -3693,7 +3693,6 @@ broken-packages:
|
||||
- persistent-discover
|
||||
- persistent-documentation
|
||||
- persistent-equivalence
|
||||
- persistent-migration
|
||||
- persistent-mongoDB
|
||||
- persistent-mysql-haskell
|
||||
- persistent-odbc
|
||||
|
||||
@ -163,6 +163,7 @@ self: super: builtins.intersectAttrs super {
|
||||
network-transport-tcp = dontCheck super.network-transport-tcp;
|
||||
network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
|
||||
oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com
|
||||
persistent-migration = dontCheck super.persistent-migration; # spec requires pg_ctl binary
|
||||
pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
|
||||
pixiv = dontCheck super.pixiv;
|
||||
raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw
|
||||
|
||||
@ -205915,8 +205915,6 @@ self: {
|
||||
];
|
||||
description = "Manual migrations for the persistent library";
|
||||
license = lib.licenses.bsd3;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
}) {};
|
||||
|
||||
"persistent-mongoDB" = callPackage
|
||||
|
||||
@ -140,7 +140,7 @@ builder rec {
|
||||
# Expect the text in format of '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"'
|
||||
new_version="$(curl -s https://www.gnu.org/software/guile/download/ |
|
||||
pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')"
|
||||
update-source-version ${pname} "$new_version"
|
||||
update-source-version guile_3_0 "$new_version"
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -120,15 +120,6 @@ with pkgs;
|
||||
};
|
||||
|
||||
sources = {
|
||||
python38 = {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "8";
|
||||
patch = "12";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "1si8hw2xpagh4iji89zdx69p3dv5mjqwwbx2x2sl6lrp41jaglxi";
|
||||
};
|
||||
python39 = {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
@ -169,19 +160,26 @@ in {
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "7";
|
||||
patch = "12";
|
||||
patch = "13";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "041jqjl5wf7gsw84zd3jgvg91skq20l2fy5zbhz237w38zxzfyzp";
|
||||
sha256 = "sha256-mfEGJ134iZw+jLnXwBzmhsIC7ydZUzAUJxlGk95b74Q=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
python38 = callPackage ./cpython ({
|
||||
python38 = callPackage ./cpython {
|
||||
self = python38;
|
||||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "8";
|
||||
patch = "13";
|
||||
suffix = "";
|
||||
};
|
||||
sha256 = "sha256-bzCQdwEgQKo5/o8MYduMD6HEUTZ2MpnTdcnldW8Jz1c=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
} // sources.python38);
|
||||
};
|
||||
|
||||
python39 = callPackage ./cpython ({
|
||||
self = python39;
|
||||
|
||||
@ -1,24 +1,50 @@
|
||||
{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, libsndfile
|
||||
, pkg-config
|
||||
, python3
|
||||
, wafHook
|
||||
, pipewire
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lv2";
|
||||
version = "1.18.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wafHook ];
|
||||
buildInputs = [ gtk2 libsndfile python3 ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wafHook
|
||||
];
|
||||
|
||||
wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
|
||||
buildInputs = [
|
||||
libsndfile
|
||||
python3
|
||||
];
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--includedir=${placeholder "dev"}/include"
|
||||
"--bindir=${placeholder "dev"}/bin"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"--lv2dir=${placeholder "out"}/lib/lv2"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
inherit pipewire;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://lv2plug.in";
|
||||
description = "A plugin standard for audio systems";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cfitsio";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz";
|
||||
sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4=";
|
||||
sha256 = "sha256-s2fGldKDGVjnFmkhw7NW1d+lGx7O5QW5dBa6OdG2wXo=";
|
||||
};
|
||||
|
||||
buildInputs = [ bzip2 zlib ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adb-enhanced";
|
||||
version = "2.5.12";
|
||||
version = "2.5.14";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "ashishb";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-OZSLk5qXX6rEclo6JC8o/7Mz0Y2sJqUsLhnrVK4gkVI=";
|
||||
sha256 = "sha256-GaPOYBQEGI40MutjjY8exABqGge2p/buk9v+NcZ5oJs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
40
pkgs/development/python-modules/aioairzone/default.nix
Normal file
40
pkgs/development/python-modules/aioairzone/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioairzone";
|
||||
version = "0.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Noltari";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-QruXxC/+61P2Mi0UILUIKp4S3wS1+E+WmzBbiUqlVe4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioairzone"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to control AirZone devices";
|
||||
homepage = "https://github.com/Noltari/aioairzone";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "20.7.1";
|
||||
version = "22.3.2";
|
||||
pname = "BoltzTraP2";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed";
|
||||
sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "check-manifest";
|
||||
version = "0.47";
|
||||
version = "0.48";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VtrdJgqcfVULFZeW0olLbQvMF2qUy8Qm2buT5eSNEs4=";
|
||||
hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gaphas";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1";
|
||||
sha256 = "sha256-71oYuLhqJ7bst0W7v9tQSoaisjONZSa9zEWzYWtGl2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.36.3";
|
||||
version = "0.37.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-S5KWyW7aeR2qdBzXQ4ka2nuxGPt69LHyq2CUdRPG9ig=";
|
||||
sha256 = "sha256-ZENCcNppXOl0OHQDdybJV+SxOgtVzF2PPN0gAPIMjXM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.4.11";
|
||||
version = "2.4.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Q86n2uAjmA05h+0NE77TBkbPiKoRYqB1b2H3MbOVmMY=";
|
||||
sha256 = "sha256-kXhUlt+lcqK3ohOA8eziFcrm4U/FAYWpie4rH5xRejI=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "intellifire4py";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "jeeftor";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hKe9sDn5t2qQ0THqFQypAGgr7cJXaZs8562NpPR/iJU=";
|
||||
hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
39
pkgs/development/python-modules/meilisearch/default.nix
Normal file
39
pkgs/development/python-modules/meilisearch/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meilisearch";
|
||||
version = "0.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meilisearch";
|
||||
repo = "meilisearch-python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iIFTZKORCXr4mNeWBtbOPWXwORuTV/IKhLYkqFgd3Hw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"meilisearch"
|
||||
];
|
||||
|
||||
# Tests spin up a local server and are not mocking the requests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for the Meilisearch API";
|
||||
homepage = "https://github.com/meilisearch/meilisearch-python";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.71";
|
||||
version = "2.1.72";
|
||||
format = "flit";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jJ7J4upDL1X1Eut1kUWdJu3Ih2mheNFt0wI+QTZMKow=";
|
||||
sha256 = "sha256-0hhnBkbgt4bSlqjvYKX2Mhty/T1vBGm91HhKmyvVzmA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "protonvpn-nm-lib";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonVPN";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY=";
|
||||
sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygmt";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "GenericMappingTools";
|
||||
repo = "pygmt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mazljxwh162df971cvv7cwnqr300r17qfs7k09s6yd6hajyhz49";
|
||||
sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymavlink";
|
||||
version = "2.4.27";
|
||||
version = "2.4.29";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-DzW1jB7L7sD9WAhk/3/0UD8PW7Nw/bHTI527NmMV6CY=";
|
||||
sha256 = "sha256-0k6DKkb/Izk15JKrSOC0u5wL3vT4x2CelZt112vc/p0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future lxml ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypandoc";
|
||||
version = "1.7.2";
|
||||
version = "1.7.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1wk8jxnysb7sa55zhxx5brylv00ivamqbk1b4lbzi58ziij08p03";
|
||||
sha256 = "sha256-Tv0vqKN9AAXdfQRMt/QuqeFB3wNTh1DsWu0XNZukTUc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-box";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "cdgriffith";
|
||||
repo = "Box";
|
||||
rev = version;
|
||||
hash = "sha256-YOYcI+OAuTumNtTylUc6dSY9shOE6eTr8M3rVbcy5hs=";
|
||||
hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.15.10";
|
||||
version = "0.15.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "VWfcDhMAuUkYObRiaXRfcB7dI75SM7zVwWWvnlrxV0k=";
|
||||
sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "renault-api";
|
||||
version = "0.1.9";
|
||||
version = "0.1.10";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "hacf-fr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CZDxJ5vgk9I1cRDXoqcrUHu+buPWYVrEcHaRXcyts7I=";
|
||||
sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stups-pierone";
|
||||
version = "1.1.50";
|
||||
version = "1.1.51";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "zalando-stups";
|
||||
repo = "pierone-cli";
|
||||
rev = version;
|
||||
hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw=";
|
||||
hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "thinc";
|
||||
version = "8.0.14";
|
||||
version = "8.0.15";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3MC8ao6BTiDyaCXj/X+DNCTpMYcTWVJFSl0X+sCc5J0=";
|
||||
sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "timetagger";
|
||||
version = "22.2.3";
|
||||
version = "22.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "almarklein";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tQel+IVqP+MngAvFgr7Yh+XCSIPWpzCBXHOj9b0Os98=";
|
||||
sha256 = "sha256-pHogDjqXuoQp5afSnPvMPaKoBtPE6u3kMi87SzY5yoU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.10.2";
|
||||
version = "3.10.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo=";
|
||||
sha256 = "sha256-K2zBEGzagQ6lOWIPkop1YYqB2/KZIj2beUJUu2Garno=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "txtorcon";
|
||||
version = "21.1.0";
|
||||
version = "22.0.0";
|
||||
|
||||
checkInputs = [ pytest mock lsof GeoIP ];
|
||||
propagatedBuildInputs = [
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6";
|
||||
sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM=";
|
||||
};
|
||||
|
||||
# Based on what txtorcon tox.ini will automatically test, allow back as far
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-python-dateutil";
|
||||
version = "2.8.9";
|
||||
version = "2.8.10";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kPlaa21Pq6NZKH8XosrlEczJ1KvImwGWm9rBGFgVwF0=";
|
||||
sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "dateutil-stubs" ];
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-freezegun";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8=";
|
||||
hash = "sha256-6dEyfpjGyqj2XeABje0nQ0fo40GY1ZqppcJK2SZdXl4=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-paramiko";
|
||||
version = "2.8.16";
|
||||
version = "2.8.17";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI=";
|
||||
sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.27.12";
|
||||
version = "2.27.13";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI=";
|
||||
sha256 = "sha256-zwZGAx3WMHETs3gU90PATwcHozVzeMK7Eyb4SEEvW6k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "57.4.10";
|
||||
version = "57.4.11";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-mhNRNnnGQPZhbi2atQ1DHJnKiumEipckP4h8gP1c8pQ=";
|
||||
sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs";
|
||||
version = "1.1.22";
|
||||
version = "1.1.23";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qtJSGvvYcdGYUUHnRnKe+z+twFqLGAn1Zl47F4CGnvc=";
|
||||
sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -32,13 +32,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.962";
|
||||
version = "2.0.968";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hpoOOU1Z8xVqoJJdGcSoWujm3amiPkZ1Qjiqh66J+ZM=";
|
||||
hash = "sha256-F+SMgNCL6qOOhfpZi0Gg/OWPjxzMDVVvXTrPOZCfrLU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-remote";
|
||||
version = "2.3.5";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8tT00ppqBGLw2h+RxaiD7r3XYzyvXOHj1U8V5H/ftyQ=";
|
||||
sha256 = "sha256-geb7uHCBvhmqyaDr8wK9sQUcHT3xVgSclovFDpHhIiw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo=";
|
||||
|
||||
@ -18,11 +18,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "gcompris";
|
||||
version = "2.1";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
|
||||
sha256 = "sha256-ljOY/uybXzfwOFmhBXB4sC4Vn/C8BP1BeUUPpdHuQwo=";
|
||||
url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz";
|
||||
sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -32,15 +32,24 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake gettext ninja qttools ];
|
||||
|
||||
buildInputs = [
|
||||
qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns
|
||||
qmlbox2d
|
||||
qtdeclarative
|
||||
qtgraphicaleffects
|
||||
qtmultimedia
|
||||
qtquickcontrols
|
||||
qtsensors
|
||||
qtxmlpatterns
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
]);
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop
|
||||
install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
|
||||
install -Dm444 ../org.kde.gcompris.desktop -t $out/share/applications
|
||||
install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo
|
||||
install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png
|
||||
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
@ -49,6 +58,7 @@ mkDerivation rec {
|
||||
description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10";
|
||||
homepage = "https://gcompris.net/";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "gcompris-qt";
|
||||
maintainers = with maintainers; [ guibou ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Sun, 29 Nov 2020 20:55:17 +0100
|
||||
Subject: [PATCH 2/2] Don't depend on pytest-runner
|
||||
|
||||
---
|
||||
setup.py | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 95dbf89..89ea2a7 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -57,7 +57,6 @@ setuptools.setup(
|
||||
]
|
||||
},
|
||||
|
||||
- setup_requires=["pytest-runner"],
|
||||
tests_require=["pytest", "pytest-asyncio", "pytest-mock"],
|
||||
|
||||
classifiers=[
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -6,11 +6,11 @@ let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.25.0a3";
|
||||
version = "1.25.0a5";
|
||||
pname = "tulir-telethon";
|
||||
src = oldAttrs.src.override {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-/kau9Q2+7giVx52tmjvYIbcDcY1/om31X9BlRvZipuk=";
|
||||
sha256 = "sha256-WFiWczuw6eVVid2Z1LsnGE6BCEhqeCuiQ/p0d2Ahbi8=";
|
||||
};
|
||||
});
|
||||
};
|
||||
@ -25,22 +25,17 @@ let
|
||||
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-telegram";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
disabled = python.pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "telegram";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Df+v1Q+5Iaa9GKcwIabMKjJwmVd5Qub8M54jEEiAPFc=";
|
||||
sha256 = "sha256-ZECTHAP5l9tAk9Ies8XuPpH9jqYDJSRSHVKz1lA6Sjg=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Re-add-entrypoint.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "telethon>=1.22,<1.23" "telethon"
|
||||
'';
|
||||
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; ([
|
||||
Mako
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-whatsapp";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "whatsapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8=";
|
||||
sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA=";
|
||||
};
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ=";
|
||||
vendorSha256 = "o3KTcnMd6Tqt9QIfW29wvN8POIFThNg8AdeGDF5wbVc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bupstash";
|
||||
version = "0.10.3";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andrewchambers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YN5pIXJRTQXqFGuXvyoSlYJEjAZ4wIYEKjEeF8qIJCI=";
|
||||
sha256 = "sha256-9yWQQ8uzDkN3Pi2OiEn+oEazc3nH53dF2GswBCu8d3c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Erpg+Sktx+L2X9k6g1ngOyM8MNoucGcScOSPMB7vld8=";
|
||||
cargoSha256 = "sha256-JAclSUFuQk768cgDEvG1rxux2xBGHl1d/NAoxw161YU=";
|
||||
|
||||
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
|
||||
buildInputs = [ libsodium ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cfripper";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-tl0g08nnY1CZ4SNcMFPARIRquiO9SCen9VWeNalLHds=";
|
||||
hash = "sha256-5TjKn7yE3g8/SyD2dVJeHnaLOTyyKpxeAeGuXbkGCeo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -5,19 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zdns";
|
||||
version = "20210327-${lib.strings.substring 0 7 rev}";
|
||||
rev = "8c53210f0b9a4fe16c70a5d854e9413c3d0c1ba2";
|
||||
version = "2022-03-14-unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zmap";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "0pdfz1489ynpw72flalnlkwybp683v826icjx7ljys45xvagdvck";
|
||||
rev = "d659a361f6d5165462c10e1c1243f420175e066b";
|
||||
hash = "sha256-856O6H03me3IM39/+6n56KJIetL+v4on6+lJx5D2Pcw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0b8h5n01xmhar1a09svb35ah48k9zdy1mn5balq0h2l0jxr05z78";
|
||||
|
||||
subPackages = [ "zdns" ];
|
||||
vendorSha256 = "sha256-5kZ0voyicnqK/0yrMYW+gR1vVDyptW6I1HgyG4zleX8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI DNS lookup tool";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swayr";
|
||||
version = "0.13.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~tsdh";
|
||||
repo = "swayr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go=";
|
||||
sha256 = "sha256-GLOJjGr29v4oVNCWgjPWluIiSeLoIYeOw2HwmSfxA8Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA=";
|
||||
cargoSha256 = "sha256-gg/IHrgfDZT+3FNM/se5X1YMcHX127jMNI/WDEpMzy4=";
|
||||
|
||||
patches = [
|
||||
./icon-paths.patch
|
||||
|
||||
@ -1,41 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus, iodash, cxxopts}:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, scdoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ydotool";
|
||||
version = "unstable-2021-01-20";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ReimuNotMoe";
|
||||
repo = "ydotool";
|
||||
rev = "b1d041f52f7bac364d6539b1251d29c3b77c0f37";
|
||||
sha256 = "1gzdbx6fv0dbcyia3yyzhv93az2gf90aszb9kcj5cnxywfpv9w9g";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA=";
|
||||
};
|
||||
|
||||
# upstream decided to use a cpp package manager called cpm.
|
||||
# we need to disable that because it wants networking, furthermore,
|
||||
# it does some system folder creating which also needs to be disabled.
|
||||
# Both changes are to respect the sandbox.
|
||||
patches = [ ./fixup-cmakelists.patch ];
|
||||
|
||||
|
||||
# cxxopts is a header only library.
|
||||
# See pull request: https://github.com/ReimuNotMoe/ydotool/pull/105
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace \
|
||||
"PUBLIC cxxopts" \
|
||||
"PUBLIC"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
boost libevdevplus libuinputplus iodash cxxopts
|
||||
scdoc
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Generic Linux command-line automation tool";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ willibutz ];
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ willibutz kraem ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From bb8bc44d22060cd1215712117cf30eae09f4f6ba Mon Sep 17 00:00:00 2001
|
||||
From: Jappie Klooster <jappieklooster@hotmail.com>
|
||||
Date: Fri, 2 Apr 2021 14:04:14 -0400
|
||||
Subject: [PATCH] Fixup cmaklists
|
||||
|
||||
We remove cpm, which is a package manager for c++,
|
||||
which requires networking, so it's better just deleted.
|
||||
|
||||
Furthermore we delete the adddirectory statements.
|
||||
These want to modify directories outside of the sandbox.
|
||||
---
|
||||
CMakeLists.txt | 26 --------------------------
|
||||
1 file changed, 26 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b5e8789..b797538 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -13,30 +13,6 @@ endif()
|
||||
|
||||
include(${CPM_DOWNLOAD_LOCATION})
|
||||
|
||||
-CPMAddPackage(
|
||||
- NAME IODash
|
||||
- GITHUB_REPOSITORY YukiWorkshop/IODash
|
||||
- VERSION 0.1.0
|
||||
-)
|
||||
-
|
||||
-CPMAddPackage(
|
||||
- NAME libevdevPlus
|
||||
- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus
|
||||
- VERSION 0.2.1
|
||||
-)
|
||||
-
|
||||
-CPMAddPackage(
|
||||
- NAME libuInputPlus
|
||||
- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus
|
||||
- VERSION 0.2.1
|
||||
-)
|
||||
-
|
||||
-CPMAddPackage(
|
||||
- NAME cxxopts
|
||||
- GITHUB_REPOSITORY jarro2783/cxxopts
|
||||
- VERSION 3.0.0
|
||||
- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3
|
||||
-)
|
||||
|
||||
set(SOURCE_FILES_LIBRARY
|
||||
CommonIncludes.hpp
|
||||
@@ -74,5 +50,3 @@ add_executable(ydotool ${SOURCE_FILES_CLIENT})
|
||||
target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus)
|
||||
install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
-add_subdirectory(Daemon)
|
||||
-add_subdirectory(manpage)
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -3038,7 +3038,7 @@ with pkgs;
|
||||
|
||||
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||
electron = electron_15;
|
||||
electron = electron_17;
|
||||
};
|
||||
element-desktop-wayland = writeScriptBin "element-desktop" ''
|
||||
#!/bin/sh
|
||||
|
||||
@ -244,6 +244,8 @@ in {
|
||||
|
||||
aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { };
|
||||
|
||||
aioairzone = callPackage ../development/python-modules/aioairzone { };
|
||||
|
||||
aioambient = callPackage ../development/python-modules/aioambient { };
|
||||
|
||||
aioapns = callPackage ../development/python-modules/aioapns { };
|
||||
@ -5045,6 +5047,8 @@ in {
|
||||
|
||||
mediafile = callPackage ../development/python-modules/mediafile { };
|
||||
|
||||
meilisearch = callPackage ../development/python-modules/meilisearch { };
|
||||
|
||||
meinheld = callPackage ../development/python-modules/meinheld { };
|
||||
|
||||
meld3 = callPackage ../development/python-modules/meld3 { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user