Merge staging-next into staging
This commit is contained in:
commit
f5a9b8ecda
146
lib/asserts.nix
146
lib/asserts.nix
@ -2,47 +2,87 @@
|
||||
|
||||
rec {
|
||||
|
||||
/* Throw if pred is false, else return pred.
|
||||
Intended to be used to augment asserts with helpful error messages.
|
||||
/**
|
||||
Throw if pred is false, else return pred.
|
||||
Intended to be used to augment asserts with helpful error messages.
|
||||
|
||||
Example:
|
||||
assertMsg false "nope"
|
||||
stderr> error: nope
|
||||
# Inputs
|
||||
|
||||
assert assertMsg ("foo" == "bar") "foo is not bar, silly"; ""
|
||||
stderr> error: foo is not bar, silly
|
||||
`pred`
|
||||
|
||||
Type:
|
||||
assertMsg :: Bool -> String -> Bool
|
||||
: Predicate that needs to succeed, otherwise `msg` is thrown
|
||||
|
||||
`msg`
|
||||
|
||||
: Message to throw in case `pred` fails
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
assertMsg :: Bool -> String -> Bool
|
||||
```
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `lib.asserts.assertMsg` usage example
|
||||
|
||||
```nix
|
||||
assertMsg false "nope"
|
||||
stderr> error: nope
|
||||
assert assertMsg ("foo" == "bar") "foo is not bar, silly"; ""
|
||||
stderr> error: foo is not bar, silly
|
||||
```
|
||||
|
||||
:::
|
||||
*/
|
||||
# TODO(Profpatsch): add tests that check stderr
|
||||
assertMsg =
|
||||
# Predicate that needs to succeed, otherwise `msg` is thrown
|
||||
pred:
|
||||
# Message to throw in case `pred` fails
|
||||
msg:
|
||||
pred || builtins.throw msg;
|
||||
|
||||
/* Specialized `assertMsg` for checking if `val` is one of the elements
|
||||
of the list `xs`. Useful for checking enums.
|
||||
/**
|
||||
Specialized `assertMsg` for checking if `val` is one of the elements
|
||||
of the list `xs`. Useful for checking enums.
|
||||
|
||||
Example:
|
||||
let sslLibrary = "libressl";
|
||||
in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
|
||||
stderr> error: sslLibrary must be one of [
|
||||
stderr> "openssl"
|
||||
stderr> "bearssl"
|
||||
stderr> ], but is: "libressl"
|
||||
# Inputs
|
||||
|
||||
Type:
|
||||
assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
|
||||
`name`
|
||||
|
||||
: The name of the variable the user entered `val` into, for inclusion in the error message
|
||||
|
||||
`val`
|
||||
|
||||
: The value of what the user provided, to be compared against the values in `xs`
|
||||
|
||||
`xs`
|
||||
|
||||
: The list of valid values
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
|
||||
```
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `lib.asserts.assertOneOf` usage example
|
||||
|
||||
```nix
|
||||
let sslLibrary = "libressl";
|
||||
in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
|
||||
stderr> error: sslLibrary must be one of [
|
||||
stderr> "openssl"
|
||||
stderr> "bearssl"
|
||||
stderr> ], but is: "libressl"
|
||||
```
|
||||
|
||||
:::
|
||||
*/
|
||||
assertOneOf =
|
||||
# The name of the variable the user entered `val` into, for inclusion in the error message
|
||||
name:
|
||||
# The value of what the user provided, to be compared against the values in `xs`
|
||||
val:
|
||||
# The list of valid values
|
||||
xs:
|
||||
assertMsg
|
||||
(lib.elem val xs)
|
||||
@ -50,29 +90,51 @@ rec {
|
||||
lib.generators.toPretty {} xs}, but is: ${
|
||||
lib.generators.toPretty {} val}";
|
||||
|
||||
/* Specialized `assertMsg` for checking if every one of `vals` is one of the elements
|
||||
of the list `xs`. Useful for checking lists of supported attributes.
|
||||
/**
|
||||
Specialized `assertMsg` for checking if every one of `vals` is one of the elements
|
||||
of the list `xs`. Useful for checking lists of supported attributes.
|
||||
|
||||
Example:
|
||||
let sslLibraries = [ "libressl" "bearssl" ];
|
||||
in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ]
|
||||
stderr> error: each element in sslLibraries must be one of [
|
||||
stderr> "openssl"
|
||||
stderr> "bearssl"
|
||||
stderr> ], but is: [
|
||||
stderr> "libressl"
|
||||
stderr> "bearssl"
|
||||
stderr> ]
|
||||
# Inputs
|
||||
|
||||
Type:
|
||||
assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool
|
||||
`name`
|
||||
|
||||
: The name of the variable the user entered `val` into, for inclusion in the error message
|
||||
|
||||
`vals`
|
||||
|
||||
: The list of values of what the user provided, to be compared against the values in `xs`
|
||||
|
||||
`xs`
|
||||
|
||||
: The list of valid values
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool
|
||||
```
|
||||
|
||||
# Examples
|
||||
:::{.example}
|
||||
## `lib.asserts.assertEachOneOf` usage example
|
||||
|
||||
```nix
|
||||
let sslLibraries = [ "libressl" "bearssl" ];
|
||||
in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ]
|
||||
stderr> error: each element in sslLibraries must be one of [
|
||||
stderr> "openssl"
|
||||
stderr> "bearssl"
|
||||
stderr> ], but is: [
|
||||
stderr> "libressl"
|
||||
stderr> "bearssl"
|
||||
stderr> ]
|
||||
```
|
||||
|
||||
:::
|
||||
*/
|
||||
assertEachOneOf =
|
||||
# The name of the variable the user entered `val` into, for inclusion in the error message
|
||||
name:
|
||||
# The list of values of what the user provided, to be compared against the values in `xs`
|
||||
vals:
|
||||
# The list of valid values
|
||||
xs:
|
||||
assertMsg
|
||||
(lib.all (val: lib.elem val xs) vals)
|
||||
|
@ -98,6 +98,24 @@ in
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
initialPrefs = mkOption {
|
||||
type = types.attrs;
|
||||
description = lib.mdDoc ''
|
||||
Initial preferences are used to configure the browser for the first run.
|
||||
Unlike {option}`programs.chromium.extraOpts`, initialPrefs can be changed by users in the browser settings.
|
||||
More information can be found in the Chromium documentation:
|
||||
<https://www.chromium.org/administrators/configuring-other-preferences/>
|
||||
'';
|
||||
default = {};
|
||||
example = literalExpression ''
|
||||
{
|
||||
"first_run_tabs" = [
|
||||
"https://nixos.org/"
|
||||
];
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -110,6 +128,7 @@ in
|
||||
{ source = "${cfg.plasmaBrowserIntegrationPackage}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; };
|
||||
"chromium/policies/managed/default.json" = lib.mkIf (defaultProfile != {}) { text = builtins.toJSON defaultProfile; };
|
||||
"chromium/policies/managed/extra.json" = lib.mkIf (cfg.extraOpts != {}) { text = builtins.toJSON cfg.extraOpts; };
|
||||
"chromium/initial_preferences" = lib.mkIf (cfg.initialPrefs != {}) { text = builtins.toJSON cfg.initialPrefs; };
|
||||
# for google-chrome https://www.chromium.org/administrators/linux-quick-start
|
||||
"opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json" = lib.mkIf cfg.enablePlasmaBrowserIntegration
|
||||
{ source = "${cfg.plasmaBrowserIntegrationPackage}/etc/opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json"; };
|
||||
|
@ -66,6 +66,10 @@ in {
|
||||
"0.0.0.0@53"
|
||||
"::@53"
|
||||
];
|
||||
listen-quic = [
|
||||
"0.0.0.0@853"
|
||||
"::@853"
|
||||
];
|
||||
automatic-acl = true;
|
||||
};
|
||||
|
||||
@ -129,8 +133,13 @@ in {
|
||||
key = "xfr_key";
|
||||
};
|
||||
|
||||
remote.primary-quic = {
|
||||
address = "192.168.0.1@853";
|
||||
key = "xfr_key";
|
||||
quic = true;
|
||||
};
|
||||
|
||||
template.default = {
|
||||
master = "primary";
|
||||
# zonefileless setup
|
||||
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2
|
||||
zonefile-sync = "-1";
|
||||
@ -139,8 +148,14 @@ in {
|
||||
};
|
||||
|
||||
zone = {
|
||||
"example.com".file = "example.com.zone";
|
||||
"sub.example.com".file = "sub.example.com.zone";
|
||||
"example.com" = {
|
||||
master = "primary";
|
||||
file = "example.com.zone";
|
||||
};
|
||||
"sub.example.com" = {
|
||||
master = "primary-quic";
|
||||
file = "sub.example.com.zone";
|
||||
};
|
||||
};
|
||||
|
||||
log.syslog.any = "debug";
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
@ -10,13 +10,13 @@
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "molsketch";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz";
|
||||
hash = "sha256-Mpx4fHktxqBAkmdwqg2pXvEgvvGUQPbgqxKwXKjhJuQ=";
|
||||
hash = "sha256-6wFvl3Aktv8RgEdI2ENsKallKlYy/f8Tsm5C0FB/igI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -54,5 +54,6 @@ mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.moni ];
|
||||
mainProgram = "molsketch";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -5,7 +5,7 @@
|
||||
, ffmpeg
|
||||
, discord-rpc
|
||||
, libedit
|
||||
, libelf
|
||||
, elfutils
|
||||
, libepoxy
|
||||
, libsForQt5
|
||||
, libzip
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SDL2
|
||||
ffmpeg
|
||||
libedit
|
||||
libelf
|
||||
elfutils
|
||||
libepoxy
|
||||
libzip
|
||||
lua
|
||||
|
@ -9,25 +9,25 @@
|
||||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.10.26" else "8.10.28-11.BETA";
|
||||
version = if channel == "stable" then "8.10.27" else "8.10.28-11.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
hash = "sha256-w2Msl8eSQGX6euRcNJY4rET2yJpLWyfWzqvf0veFDU0=";
|
||||
hash = "sha256-xQQXPDC8mvQyC+z3y0n5KpRpLjrBeslwXPf28wfKVSM=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
|
||||
hash = "sha256-3Hq202h2BOUnk1XiAgeW2Tc2BBq3ZCN0EXTh8u3OQ6o=";
|
||||
hash = "sha256-c26G/Zp+1Y6ZzGYeybFBJOB2gDx3k+4/Uu7sMlXHYjM=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
hash = "sha256-PXlmJfcMiTHdUoXfnk2Za86xUHozQF8cpKMJ75SmCjg=";
|
||||
hash = "sha256-9LrSJ9PLRXFbA7xkBbqFIZVtAuy7UrDBh7e6rlLqrM0=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
hash = "sha256-Wd5rsln8itagb/F5ZaDenBiBjJc8SlRxtlWD+JCDrVY=";
|
||||
hash = "sha256-4oqpsRZ10y2uh2gp4QyHfUdKER8v8n8mjNFVwKRYkpo=";
|
||||
};
|
||||
};
|
||||
beta = {
|
||||
|
@ -110,8 +110,8 @@ in stdenv.mkDerivation {
|
||||
cp -a resources/icons $out/share
|
||||
|
||||
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
|
||||
patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
|
||||
for file in $(find $out -type f -name \*.so\* ); do
|
||||
patchelf --set-rpath ${rpath}:$out/share/1password $file
|
||||
done
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bemenu";
|
||||
version = "0.6.17";
|
||||
version = "0.6.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cloudef";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-HfA8VtYP8YHMQNXrg3E6IwX7rR3rp/gyE62InsddjZE=";
|
||||
hash = "sha256-k7xpMZUANacW/Qw7PSt+6XMPshSkmTHh/OGQlu7nmKY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -13,13 +13,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cartridges";
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kra-mo";
|
||||
repo = "cartridges";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-N1Ow2lkBOSnrxI0qLaaJeqgdU2E+jRYxj5Zu/wzS6ds=";
|
||||
hash = "sha256-AfO+vLJSWdaMqqbzRZWrY94nu/9BM7mqdad9rkiq1pg=";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
|
@ -216,6 +216,9 @@ let
|
||||
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
|
||||
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
|
||||
./patches/angle-wayland-include-protocol.patch
|
||||
# Chromium reads initial_preferences from its own executable directory
|
||||
# This patch modifies it to read /etc/chromium/initial_preferences
|
||||
./patches/chromium-initial-prefs.patch
|
||||
] ++ lib.optionals (chromiumVersionAtLeast "120") [
|
||||
# We need to revert this patch to build M120+ with LLVM 17:
|
||||
./patches/chromium-120-llvm-17.patch
|
||||
|
@ -0,0 +1,19 @@
|
||||
diff --git a/chrome/browser/first_run/first_run_internal_linux.cc b/chrome/browser/first_run/first_run_internal_linux.cc
|
||||
index 33fd579012..9a17b54b37 100644
|
||||
--- a/chrome/browser/first_run/first_run_internal_linux.cc
|
||||
+++ b/chrome/browser/first_run/first_run_internal_linux.cc
|
||||
@@ -19,13 +19,7 @@ bool IsOrganicFirstRun() {
|
||||
}
|
||||
|
||||
base::FilePath InitialPrefsPath() {
|
||||
- // The standard location of the initial prefs is next to the chrome binary.
|
||||
- base::FilePath dir_exe;
|
||||
- if (!base::PathService::Get(base::DIR_EXE, &dir_exe)) {
|
||||
- return base::FilePath();
|
||||
- }
|
||||
-
|
||||
- return installer::InitialPreferences::Path(dir_exe);
|
||||
+ return base::FilePath("/etc/chromium/initial_preferences");
|
||||
}
|
||||
|
||||
} // namespace internal
|
@ -15,9 +15,9 @@
|
||||
version = "2024-01-22";
|
||||
};
|
||||
};
|
||||
hash = "sha256-7fIs8qQon9L0iNmM/cHuyqtVm09qf7L4j9qb6KSbw2w=";
|
||||
hash_deb_amd64 = "sha256-hOm7YZ9ya/SmwKhj6uIPkdgIDv5bIbss398szBYHuXk=";
|
||||
version = "122.0.6261.94";
|
||||
hash = "sha256-43h11bx/k78W7fEPZz4LwxNVExwGSSt74mlbiUYf5ig=";
|
||||
hash_deb_amd64 = "sha256-juwTFdJB1hgAA14aabNIrql5aaP1JWQy7nOsoTF2Vto=";
|
||||
version = "122.0.6261.111";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
@ -28,12 +28,12 @@
|
||||
version = "2024-01-22";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
hash = "sha256-vqiizzSVWV2/iADPac8qgfdZcbunc0QgMqN15NwJ9js=";
|
||||
rev = "122.0.6261.94-1";
|
||||
hash = "sha256-7c4VQLotLHmSFKfzzXrlwXKB3XPFpyRTnuATrS9RfEw=";
|
||||
rev = "122.0.6261.111-1";
|
||||
};
|
||||
};
|
||||
hash = "sha256-7fIs8qQon9L0iNmM/cHuyqtVm09qf7L4j9qb6KSbw2w=";
|
||||
hash_deb_amd64 = "sha256-hOm7YZ9ya/SmwKhj6uIPkdgIDv5bIbss398szBYHuXk=";
|
||||
version = "122.0.6261.94";
|
||||
hash = "sha256-43h11bx/k78W7fEPZz4LwxNVExwGSSt74mlbiUYf5ig=";
|
||||
hash_deb_amd64 = "sha256-juwTFdJB1hgAA14aabNIrql5aaP1JWQy7nOsoTF2Vto=";
|
||||
version = "122.0.6261.111";
|
||||
};
|
||||
}
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k9s";
|
||||
version = "0.32.2";
|
||||
version = "0.32.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derailed";
|
||||
repo = "k9s";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lqLXk98rH5ZBI54ovj7YlyPh88d9Z9/jPjwUixeNJQc=";
|
||||
hash = "sha256-rw+MoMI/VmFvCE94atfP+djg+N75qwRfxjRlyCvLxR8=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OxsRyewBiZHrZtPyhuR7MQGVqtSpoW+qZRmZQDGPWck=";
|
||||
hash = "sha256-mVoXJPNkG0VPTaZ1pg6oB5qa/bYQa9Gn82CoGRsVwWg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.55.11";
|
||||
version = "0.55.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pInZs9XWYRcVzeKRS/BK5mqqlfGnWUFbJT/jdrW0gyQ=";
|
||||
hash = "sha256-RwPpABQnfcMfOMZm2PPT3w03HU8Y73leI+xxlHqZF10=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gXqpBi89VVxHSuHzzcxVRAsdu7TRsNo/vQgI1tMVuaM=";
|
||||
vendorHash = "sha256-sdEA/5QQ85tGfo7qSCD/lD20uAh045fl3tF9nFfH6x0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wee-slack";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "wee-slack";
|
||||
owner = "wee-slack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-J4s7+JFd/y1espp3HZCs48++fhN6lmpaglGkgomtf3o=";
|
||||
sha256 = "sha256-EtPhaNFYDxxSrSLXHHnY4ARpRycNNxbg5QPKtnPem04=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -4,13 +4,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcoap";
|
||||
version = "4.3.4";
|
||||
version = "4.3.4a";
|
||||
src = fetchFromGitHub {
|
||||
repo = "libcoap";
|
||||
owner = "obgm";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-x8r5fHY8J0NYE7nPSw/bPpK/iTLKioKpQKmVw73KOtg=";
|
||||
sha256 = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
automake
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hackrf";
|
||||
version = "2023.01.1";
|
||||
version = "2024.02.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greatscottgadgets";
|
||||
repo = "hackrf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zvSSCNtqHOZVlrBggjgxEyUTqTiAIAhdzUkm4Pm9b3k=";
|
||||
sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cryptominisat";
|
||||
version = "5.11.15";
|
||||
version = "5.11.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msoos";
|
||||
repo = "cryptominisat";
|
||||
rev = version;
|
||||
hash = "sha256-OenuIPo5U0+egWMpxfaKWPLbO5YRQJSXLYptih+ZQQ0=";
|
||||
hash = "sha256-8oH9moMjQEWnQXKmKcqmXuXcYkEyvr4hwC1bC4l26mo=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 boost ];
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell
|
||||
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell, fetchpatch
|
||||
, openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -23,6 +23,14 @@ rustPlatform.buildRustPackage rec {
|
||||
buildFeatures = [ "no-self-update" ];
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
# revert temporary directory creation, because it break the wrapper
|
||||
# https://github.com/NixOS/nixpkgs/pull/289941#issuecomment-1980778358
|
||||
(fetchpatch {
|
||||
url = "https://github.com/leanprover/elan/commit/bd54acaab75d08b3912ee1f051af8657f3a9cfdf.patch";
|
||||
hash = "sha256-6If/wxWSea8Zjlp3fx9wh3D0TjmWZbvCuY9q5c2qJGA=";
|
||||
revert = true;
|
||||
})
|
||||
|
||||
# Run patchelf on the downloaded binaries.
|
||||
# This is necessary because Lean 4 is now dynamically linked.
|
||||
(runCommand "0001-dynamically-patchelf-binaries.patch" {
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenmath";
|
||||
version = "unstable-2024-02-25";
|
||||
version = "unstable-2024-03-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgeweigt";
|
||||
repo = pname;
|
||||
rev = "4391a5bfe22d095cdf9fc12f376f64a8ffccccd9";
|
||||
hash = "sha256-p+dnu35HGX8SgVpq5NczoZVehzfcuN+uucGurT7lWYM=";
|
||||
rev = "ff2a5f89969e106f57ad624ac3897e06f26692d7";
|
||||
hash = "sha256-54nw734EjICaac8PvdgiGeDWdJTCXnWVUJL2uE937E4=";
|
||||
};
|
||||
|
||||
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
|
||||
|
@ -15,7 +15,7 @@ assert withThread -> libpthreadstubs != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pari";
|
||||
version = "2.15.4";
|
||||
version = "2.15.5";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
# old versions are at the url below
|
||||
"https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-w1Rb/uDG37QLd/tLurr5mdguYAabn20ovLbPAEyMXA8=";
|
||||
hash = "sha256-Dv3adRXZ2VT2MyTDSzTFYOYPc6gcOSSnEmCizJHV+YE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -16,8 +16,8 @@ let
|
||||
abseil-cpp = fetchFromGitHub {
|
||||
owner = "abseil";
|
||||
repo = "abseil-cpp";
|
||||
rev = "fb3621f4f897824c0dbe0615fa94543df6192f30";
|
||||
hash = "sha256-uNGrTNg5G5xFGtc+BSWE389x0tQ/KxJQLHfebNWas/k=";
|
||||
rev = "2f9e432cce407ce0ae50676696666f33a77d42ac";
|
||||
hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM=";
|
||||
};
|
||||
benchmark = fetchFromGitHub {
|
||||
owner = "google";
|
||||
@ -34,8 +34,8 @@ let
|
||||
eigen3 = fetchFromGitLab {
|
||||
owner = "libeigen";
|
||||
repo = "eigen";
|
||||
rev = "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3";
|
||||
hash = "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8=";
|
||||
rev = "2a9055b50ed22101da7d77e999b90ed50956fe0b";
|
||||
hash = "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=";
|
||||
};
|
||||
googletest = fetchFromGitHub {
|
||||
owner = "google";
|
||||
@ -96,8 +96,8 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "UPC-ViRVIG";
|
||||
repo = name;
|
||||
rev = "7c49cfba9bbec763b5d0f7b90b26555f3dde8088";
|
||||
hash = "sha256-5bnQ3rHH9Pw1jRVpZpamFnhIJHWnGm6krgZgIBqNtVg=";
|
||||
rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae";
|
||||
hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE=";
|
||||
};
|
||||
|
||||
patches = [ ./sdflib-system-deps.patch ];
|
||||
@ -129,7 +129,7 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mujoco";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
# Bumping version? Make sure to look though the MuJoCo's commit
|
||||
# history for bumped dependency pins!
|
||||
@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "google-deepmind";
|
||||
repo = "mujoco";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Zbz6qq2Sjhcrf8QAGFlYkSZ8mA/wQaP81gRzMj3xh+g=";
|
||||
hash = "sha256-22yH3zAD479TRNS3XSqy6PuuLqyWmjvwScUTVfKumzY=";
|
||||
};
|
||||
|
||||
patches = [ ./mujoco-system-deps-dont-fetch.patch ];
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 285250b..32d03e3 100644
|
||||
index eea180c0..efb39178 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -92,7 +92,7 @@ add_subdirectory(src/render)
|
||||
@@ -93,7 +93,7 @@ add_subdirectory(src/render)
|
||||
add_subdirectory(src/thread)
|
||||
add_subdirectory(src/ui)
|
||||
|
||||
@ -11,7 +11,7 @@ index 285250b..32d03e3 100644
|
||||
if(MUJOCO_ENABLE_AVX_INTRINSICS)
|
||||
target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD)
|
||||
endif()
|
||||
@@ -117,7 +117,7 @@ target_link_libraries(
|
||||
@@ -118,7 +118,7 @@ target_link_libraries(
|
||||
lodepng
|
||||
qhullstatic_r
|
||||
tinyobjloader
|
||||
@ -21,30 +21,17 @@ index 285250b..32d03e3 100644
|
||||
|
||||
set_target_properties(
|
||||
diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
|
||||
index 4e3e2c8..f6143d9 100644
|
||||
index 44962272..656beeb8 100644
|
||||
--- a/cmake/MujocoDependencies.cmake
|
||||
+++ b/cmake/MujocoDependencies.cmake
|
||||
@@ -90,153 +90,203 @@ set(BUILD_SHARED_LIBS
|
||||
CACHE INTERNAL "Build SHARED libraries"
|
||||
)
|
||||
|
||||
+
|
||||
@@ -93,28 +93,36 @@ set(BUILD_SHARED_LIBS
|
||||
if(NOT TARGET lodepng)
|
||||
- FetchContent_Declare(
|
||||
+ fetchcontent_declare(
|
||||
FetchContent_Declare(
|
||||
lodepng
|
||||
- GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
|
||||
- GIT_TAG ${MUJOCO_DEP_VERSION_lodepng}
|
||||
)
|
||||
+endif()
|
||||
+
|
||||
+if(NOT TARGET lodepng)
|
||||
+ if(NOT MUJOCO_USE_SYSTEM_lodepng)
|
||||
+ fetchcontent_declare(
|
||||
+ lodepng
|
||||
+ GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
|
||||
+ GIT_TAG ${MUJOCO_DEP_VERSION_lodepng}
|
||||
+ )
|
||||
|
||||
- FetchContent_GetProperties(lodepng)
|
||||
- if(NOT lodepng_POPULATED)
|
||||
@ -56,9 +43,17 @@ index 4e3e2c8..f6143d9 100644
|
||||
- target_compile_options(lodepng PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
|
||||
- target_link_options(lodepng PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
|
||||
- target_include_directories(lodepng PUBLIC ${lodepng_SOURCE_DIR})
|
||||
+ fetchcontent_getproperties(lodepng)
|
||||
+if(NOT TARGET lodepng)
|
||||
+ if(NOT MUJOCO_USE_SYSTEM_lodepng)
|
||||
+ fetchcontent_declare(
|
||||
+ lodepng
|
||||
+ GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
|
||||
+ GIT_TAG ${MUJOCO_DEP_VERSION_lodepng}
|
||||
+ )
|
||||
+
|
||||
+ FetchContent_GetProperties(lodepng)
|
||||
+ if(NOT lodepng_POPULATED)
|
||||
+ fetchcontent_populate(lodepng)
|
||||
+ FetchContent_Populate(lodepng)
|
||||
+ # This is not a CMake project.
|
||||
+ set(LODEPNG_SRCS ${lodepng_SOURCE_DIR}/lodepng.cpp)
|
||||
+ set(LODEPNG_HEADERS ${lodepng_SOURCE_DIR}/lodepng.h)
|
||||
@ -73,19 +68,14 @@ index 4e3e2c8..f6143d9 100644
|
||||
endif()
|
||||
|
||||
if(NOT TARGET marchingcubecpp)
|
||||
- FetchContent_Declare(
|
||||
+ fetchcontent_declare(
|
||||
FetchContent_Declare(
|
||||
marchingcubecpp
|
||||
- GIT_REPOSITORY https://github.com/aparis69/MarchingCubeCpp.git
|
||||
- GIT_TAG ${MUJOCO_DEP_VERSION_MarchingCubeCpp}
|
||||
)
|
||||
|
||||
- FetchContent_GetProperties(marchingcubecpp)
|
||||
+ fetchcontent_getproperties(marchingcubecpp)
|
||||
if(NOT marchingcubecpp_POPULATED)
|
||||
- FetchContent_Populate(marchingcubecpp)
|
||||
+ fetchcontent_populate(marchingcubecpp)
|
||||
include_directories(${marchingcubecpp_SOURCE_DIR})
|
||||
FetchContent_GetProperties(marchingcubecpp)
|
||||
@@ -124,119 +132,158 @@ if(NOT TARGET marchingcubecpp)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -118,7 +108,6 @@ index 4e3e2c8..f6143d9 100644
|
||||
-)
|
||||
-target_compile_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
|
||||
-target_link_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
|
||||
+
|
||||
+if(NOT MUJOCO_USE_SYSTEM_qhull)
|
||||
+ # MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories.
|
||||
+ # Add it to the target.
|
||||
@ -165,7 +154,6 @@ index 4e3e2c8..f6143d9 100644
|
||||
)
|
||||
-target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
|
||||
-target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
|
||||
+
|
||||
+if(NOT MUJOCO_USE_SYSTEM_tinyxml2)
|
||||
+ target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
|
||||
+ target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
|
||||
@ -297,7 +285,7 @@ index 4e3e2c8..f6143d9 100644
|
||||
set(ABSL_PROPAGATE_CXX_STD ON)
|
||||
|
||||
# This specific version of Abseil does not have the following variable. We need to work with BUILD_TESTING
|
||||
@@ -249,15 +299,11 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -249,15 +296,11 @@ if(MUJOCO_BUILD_TESTS)
|
||||
set(ABSL_BUILD_TESTING OFF)
|
||||
findorfetch(
|
||||
USE_SYSTEM_PACKAGE
|
||||
@ -314,7 +302,7 @@ index 4e3e2c8..f6143d9 100644
|
||||
TARGETS
|
||||
absl::core_headers
|
||||
EXCLUDE_FROM_ALL
|
||||
@@ -268,6 +314,9 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -268,6 +311,9 @@ if(MUJOCO_BUILD_TESTS)
|
||||
CACHE BOOL "Build tests." FORCE
|
||||
)
|
||||
|
||||
@ -324,7 +312,7 @@ index 4e3e2c8..f6143d9 100644
|
||||
# Avoid linking errors on Windows by dynamically linking to the C runtime.
|
||||
set(gtest_force_shared_crt
|
||||
ON
|
||||
@@ -276,22 +325,20 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -276,22 +322,20 @@ if(MUJOCO_BUILD_TESTS)
|
||||
|
||||
findorfetch(
|
||||
USE_SYSTEM_PACKAGE
|
||||
@ -353,7 +341,7 @@ index 4e3e2c8..f6143d9 100644
|
||||
set(BENCHMARK_EXTRA_FETCH_ARGS "")
|
||||
if(WIN32 AND NOT MSVC)
|
||||
set(BENCHMARK_EXTRA_FETCH_ARGS
|
||||
@@ -310,15 +357,11 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -310,15 +354,11 @@ if(MUJOCO_BUILD_TESTS)
|
||||
|
||||
findorfetch(
|
||||
USE_SYSTEM_PACKAGE
|
||||
@ -370,7 +358,7 @@ index 4e3e2c8..f6143d9 100644
|
||||
TARGETS
|
||||
benchmark::benchmark
|
||||
benchmark::benchmark_main
|
||||
@@ -328,26 +371,42 @@ if(MUJOCO_BUILD_TESTS)
|
||||
@@ -328,15 +368,18 @@ if(MUJOCO_BUILD_TESTS)
|
||||
endif()
|
||||
|
||||
if(MUJOCO_TEST_PYTHON_UTIL)
|
||||
@ -387,21 +375,14 @@ index 4e3e2c8..f6143d9 100644
|
||||
+ set(CMAKE_POLICY_DEFAULT_CMP0057 NEW)
|
||||
+ endif()
|
||||
|
||||
- FetchContent_Declare(
|
||||
+ fetchcontent_declare(
|
||||
FetchContent_Declare(
|
||||
Eigen3
|
||||
- GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
|
||||
- GIT_TAG ${MUJOCO_DEP_VERSION_Eigen3}
|
||||
)
|
||||
|
||||
- FetchContent_GetProperties(Eigen3)
|
||||
+ fetchcontent_getproperties(Eigen3)
|
||||
if(NOT Eigen3_POPULATED)
|
||||
- FetchContent_Populate(Eigen3)
|
||||
+ fetchcontent_populate(Eigen3)
|
||||
|
||||
# Mark the library as IMPORTED as a workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/15415
|
||||
add_library(Eigen3::Eigen INTERFACE IMPORTED)
|
||||
FetchContent_GetProperties(Eigen3)
|
||||
@@ -348,6 +391,19 @@ if(MUJOCO_TEST_PYTHON_UTIL)
|
||||
set_target_properties(
|
||||
Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}"
|
||||
)
|
||||
@ -422,7 +403,7 @@ index 4e3e2c8..f6143d9 100644
|
||||
endif()
|
||||
endif()
|
||||
diff --git a/plugin/sdf/CMakeLists.txt b/plugin/sdf/CMakeLists.txt
|
||||
index 3e216fc..e7e3a1e 100644
|
||||
index 3e216fc4..e7e3a1eb 100644
|
||||
--- a/plugin/sdf/CMakeLists.txt
|
||||
+++ b/plugin/sdf/CMakeLists.txt
|
||||
@@ -37,7 +37,7 @@ set(MUJOCO_SDF_SRCS
|
||||
@ -435,7 +416,7 @@ index 3e216fc..e7e3a1e 100644
|
||||
sdf
|
||||
PRIVATE ${AVX_COMPILE_OPTIONS}
|
||||
diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt
|
||||
index 666a372..d89bb49 100644
|
||||
index 666a3725..d89bb499 100644
|
||||
--- a/python/mujoco/util/CMakeLists.txt
|
||||
+++ b/python/mujoco/util/CMakeLists.txt
|
||||
@@ -63,8 +63,8 @@ if(BUILD_TESTING)
|
||||
@ -483,7 +464,7 @@ index 666a372..d89bb49 100644
|
||||
gtest_add_tests(TARGET tuple_tools_test SOURCES tuple_tools_test.cc)
|
||||
endif()
|
||||
diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake
|
||||
index 5141406..75ff788 100644
|
||||
index 5141406c..75ff7884 100644
|
||||
--- a/simulate/cmake/SimulateDependencies.cmake
|
||||
+++ b/simulate/cmake/SimulateDependencies.cmake
|
||||
@@ -81,10 +81,6 @@ findorfetch(
|
||||
@ -498,7 +479,7 @@ index 5141406..75ff788 100644
|
||||
glfw
|
||||
EXCLUDE_FROM_ALL
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 6bec911..2a16c21 100644
|
||||
index 122760a9..ddd90819 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -30,7 +30,7 @@ macro(mujoco_test name)
|
||||
@ -510,10 +491,10 @@ index 6bec911..2a16c21 100644
|
||||
target_include_directories(${name} PRIVATE ${MUJOCO_TEST_INCLUDE})
|
||||
set_target_properties(${name} PROPERTIES BUILD_RPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
|
||||
# gtest_discover_tests is recommended over gtest_add_tests, but has some issues in Windows.
|
||||
@@ -59,20 +59,20 @@ target_link_libraries(
|
||||
PUBLIC absl::core_headers
|
||||
absl::strings
|
||||
@@ -60,20 +60,20 @@ target_link_libraries(
|
||||
absl::synchronization
|
||||
absl::flat_hash_map
|
||||
absl::flat_hash_set
|
||||
- gtest
|
||||
- gmock
|
||||
+ GTest::gtest
|
||||
@ -528,11 +509,11 @@ index 6bec911..2a16c21 100644
|
||||
|
||||
mujoco_test(header_test)
|
||||
-target_link_libraries(header_test fixture gmock)
|
||||
+target_link_libraries(header_test fixture GTest::gmock)
|
||||
+target_link_libraries(fixture_test fixture GTest::gmock)
|
||||
|
||||
mujoco_test(pipeline_test)
|
||||
-target_link_libraries(pipeline_test fixture gmock)
|
||||
+target_link_libraries(pipeline_test fixture GTest::gmock)
|
||||
+target_link_libraries(fixture_test fixture GTest::gmock)
|
||||
|
||||
add_subdirectory(benchmark)
|
||||
add_subdirectory(engine)
|
||||
|
@ -4,7 +4,25 @@
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
pychromecast = super.pychromecast.overridePythonAttrs (_: rec {
|
||||
version = "13.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyChromecast";
|
||||
inherit version;
|
||||
hash = "sha256-COYai1S9IRnTyasewBNtPYVjqpfgo7V4QViLm+YMJnY=";
|
||||
};
|
||||
|
||||
postPatch = "";
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "catt";
|
||||
version = "0.12.11";
|
||||
format = "pyproject";
|
||||
@ -22,11 +40,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
click
|
||||
ifaddr
|
||||
pychromecast
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bruteforce-salted-openssl";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glv2";
|
||||
repo = "bruteforce-salted-openssl";
|
||||
rev = version;
|
||||
hash = "sha256-ICxXdKjRP2vXdJpjn0PP0/6rw9LKju0nVOSj47TyrzY=";
|
||||
hash = "sha256-hXB4CUQ5pihKmahyK359cgQACrs6YH1gHmZJAuTXgQM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "dorion";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-hpZF83QPRcRqI0wCnIu6CsNBe8b9H0KrDyp6CDYkOfQ=";
|
||||
hash = "sha256-O6KXOouutrNla5dkHRQeT0kp8DQO9MLoJrIMuqam/60=";
|
||||
};
|
||||
|
||||
unpackCmd = ''
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eiwd";
|
||||
version = "2.10-1";
|
||||
version = "2.14-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "illiliti";
|
||||
repo = "eiwd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-AB4NBwfELy0yjzxS0rCcF641CGEdyM9tTB+ZWaM+erg=";
|
||||
hash = "sha256-9d7XDA98qMA6Myeik2Tpj0x6yd5VQozt+FHl0U3da50=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -18,7 +18,11 @@ python3.pkgs.buildPythonPackage rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace robusta_krr/__init__.py \
|
||||
--replace-warn '1.7.0-dev' '${version}'
|
||||
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-warn '1.7.0-dev' '${version}' \
|
||||
--replace-fail 'aiostream = "^0.4.5"' 'aiostream = "*"' \
|
||||
--replace-fail 'kubernetes = "^26.1.0"' 'kubernetes = "*"' \
|
||||
--replace-fail 'pydantic = "1.10.7"' 'pydantic = "*"' \
|
||||
|
@ -15,6 +15,7 @@ python3Packages.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiosqlite"
|
||||
"pillow"
|
||||
"httpx"
|
||||
];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.33.1";
|
||||
version = "2.33.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = "spicetify-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nKbdwgxHiI1N2REEI7WrPf54uy4Nm1XU0g5hEjYriEY=";
|
||||
hash = "sha256-GCeauokKzIbWwYrUopvvKEV7OBdoCfzFjHj0YxSuW3U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9rYShpUVI3KSY6UgGmoXo899NkUezkAAkTgFPdq094E=";
|
||||
|
@ -11,10 +11,6 @@
|
||||
"clean": "rm -rf node_modules",
|
||||
"prettier-format": "prettier --config .prettierrc 'src/**/*.ts*' --write"
|
||||
},
|
||||
"resolutions": {
|
||||
"@types/react": "^17.0.1",
|
||||
"@types/react-dom": "^17.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.11.1",
|
||||
"@emotion/styled": "^11.11.0",
|
||||
@ -47,6 +43,7 @@
|
||||
"@tiptap/react": "^2.0.4",
|
||||
"@tiptap/starter-kit": "^2.0.4",
|
||||
"@types/lodash": "^4.14.195",
|
||||
"fuse.js": "^7.0.0",
|
||||
"jotai": "^2.2.2",
|
||||
"lodash": "^4.17.21",
|
||||
"lowlight": "^2.9.0",
|
||||
@ -54,13 +51,14 @@
|
||||
"react": "^18.2.0",
|
||||
"react-dnd": "^16.0.1",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-idle-timer": "^5.7.2",
|
||||
"wouter": "^2.11.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^1.4.0",
|
||||
"@types/node": "^20.4.4",
|
||||
"@types/react": "^18.2.15",
|
||||
"@types/react-dom": "^18.2.7",
|
||||
"@types/react-dom": "^18.2.19",
|
||||
"@vitejs/plugin-react": "^4.0.3",
|
||||
"prettier": "^3.0.0",
|
||||
"typescript": "^5.1.6",
|
||||
|
@ -19,12 +19,12 @@
|
||||
|
||||
let
|
||||
pname = "treedome";
|
||||
version = "0.4";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/solver-orgz/treedome";
|
||||
rev = version;
|
||||
hash = "sha256-HzpfctEeiPj5fO1LCiQDvWRuXCPJIX7RsYYr/Y/sahA=";
|
||||
hash = "sha256-Ypc5+HXmpyMjJDQCyxYwauozaf4HkjcbpDZNGVGPW7o=";
|
||||
fetchLFS = true;
|
||||
};
|
||||
|
||||
@ -34,7 +34,7 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-SU020NgQY2TXbAsGzrXa0gLEt0hllsgD82S5L2lEtKU=";
|
||||
hash = "sha256-nUOKN/0BTibRI66Do+iQUFy8NKkcaxFKr5AOtK3K13Q=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
@ -1097,7 +1097,7 @@ self: super: builtins.intersectAttrs super {
|
||||
hercules-ci-cnix-store = overrideCabal
|
||||
(old: {
|
||||
passthru = old.passthru or { } // {
|
||||
nixPackage = pkgs.nixVersions.nix_2_16;
|
||||
nixPackage = pkgs.nixVersions.nix_2_19;
|
||||
};
|
||||
})
|
||||
(super.hercules-ci-cnix-store.override {
|
||||
|
@ -29,7 +29,7 @@ let
|
||||
];
|
||||
|
||||
extensions = lib.composeManyExtensions ([
|
||||
nonHackagePackages
|
||||
(nonHackagePackages { inherit pkgs haskellLib; })
|
||||
(configurationNix { inherit pkgs haskellLib; })
|
||||
(configurationCommon { inherit pkgs haskellLib; })
|
||||
] ++ platformConfigurations ++ [
|
||||
|
@ -0,0 +1,66 @@
|
||||
{ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
|
||||
, bifunctors, binary, binary-conduit, boost, bytestring, Cabal
|
||||
, cabal-pkg-config-version-hook, cachix, cachix-api, conduit
|
||||
, conduit-extra, containers, directory, dlist, exceptions, filepath
|
||||
, hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core
|
||||
, hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec
|
||||
, hspec-discover, http-client, http-client-tls, http-conduit, HUnit
|
||||
, inline-c, inline-c-cpp, katip, lens, lens-aeson, lib
|
||||
, lifted-async, lifted-base, monad-control, mtl, network
|
||||
, network-uri, nix, optparse-applicative, process, process-extras
|
||||
, profunctors, protolude, QuickCheck, safe-exceptions, scientific
|
||||
, servant, servant-auth-client, servant-client, servant-client-core
|
||||
, stm, tagged, temporary, text, time, tls, tomland, transformers
|
||||
, transformers-base, unbounded-delays, unix, unliftio
|
||||
, unliftio-core, unordered-containers, uuid, vector, websockets
|
||||
, wuss
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hercules-ci-agent";
|
||||
version = "0.10.1";
|
||||
sha256 = "a87e1b9ee650c493137d98370df8b3a9d842eea5b3a4c935c34275267ccf94d5";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ];
|
||||
libraryHaskellDepends = [
|
||||
aeson async base binary binary-conduit bytestring conduit
|
||||
containers directory dlist exceptions filepath
|
||||
hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr
|
||||
hercules-ci-cnix-store katip lens lens-aeson lifted-async
|
||||
lifted-base monad-control mtl network network-uri process
|
||||
process-extras protolude safe-exceptions stm tagged temporary text
|
||||
time tls transformers transformers-base unbounded-delays unix
|
||||
unliftio unliftio-core uuid vector websockets wuss
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson async attoparsec base base64-bytestring bifunctors binary
|
||||
binary-conduit bytestring cachix cachix-api conduit conduit-extra
|
||||
containers directory dlist exceptions filepath hercules-ci-api
|
||||
hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr
|
||||
hercules-ci-cnix-store hostname http-client http-client-tls
|
||||
http-conduit inline-c inline-c-cpp katip lens lens-aeson
|
||||
lifted-async lifted-base monad-control mtl network network-uri
|
||||
optparse-applicative process process-extras profunctors protolude
|
||||
safe-exceptions scientific servant servant-auth-client
|
||||
servant-client servant-client-core stm temporary text time tomland
|
||||
transformers transformers-base unix unliftio unliftio-core
|
||||
unordered-containers uuid vector websockets wuss
|
||||
];
|
||||
executableSystemDepends = [ boost ];
|
||||
executablePkgconfigDepends = [ nix ];
|
||||
testHaskellDepends = [
|
||||
aeson async attoparsec base bifunctors binary binary-conduit
|
||||
bytestring conduit containers exceptions filepath
|
||||
hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store
|
||||
hspec HUnit katip lens lens-aeson lifted-async lifted-base
|
||||
monad-control mtl process profunctors protolude QuickCheck
|
||||
safe-exceptions scientific stm tagged temporary text tomland
|
||||
transformers transformers-base unliftio-core unordered-containers
|
||||
uuid vector
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
homepage = "https://docs.hercules-ci.com";
|
||||
description = "Runs Continuous Integration tasks on your machines";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
@ -0,0 +1,27 @@
|
||||
{ mkDerivation, aeson, base, base64-bytestring-type, bytestring
|
||||
, containers, cookie, deepseq, exceptions, hashable
|
||||
, hercules-ci-api-core, hspec, http-api-data, http-media, lens
|
||||
, lens-aeson, lib, memory, network-uri, profunctors, QuickCheck
|
||||
, quickcheck-classes, servant, servant-auth, string-conv, swagger2
|
||||
, text, time, unordered-containers, uuid, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hercules-ci-api-agent";
|
||||
version = "0.5.1.0";
|
||||
sha256 = "4d98e5a3824b09e3989251787dc0e3c9724011282eec343065c70ba9f1565ee6";
|
||||
libraryHaskellDepends = [
|
||||
aeson base base64-bytestring-type bytestring containers cookie
|
||||
deepseq exceptions hashable hercules-ci-api-core http-api-data
|
||||
http-media lens lens-aeson memory servant servant-auth string-conv
|
||||
swagger2 text time unordered-containers uuid vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers cookie exceptions hashable
|
||||
hercules-ci-api-core hspec http-api-data http-media lens memory
|
||||
network-uri profunctors QuickCheck quickcheck-classes servant
|
||||
servant-auth string-conv swagger2 text time uuid vector
|
||||
];
|
||||
homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme";
|
||||
description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
@ -0,0 +1,22 @@
|
||||
{ mkDerivation, aeson, base, bytestring, containers, cookie
|
||||
, deepseq, exceptions, hashable, http-api-data, http-media, katip
|
||||
, lens, lib, lifted-base, memory, monad-control, openapi3
|
||||
, safe-exceptions, servant, servant-auth, servant-auth-swagger
|
||||
, servant-openapi3, servant-swagger, servant-swagger-ui-core
|
||||
, string-conv, swagger2, text, time, uuid
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hercules-ci-api-core";
|
||||
version = "0.1.6.0";
|
||||
sha256 = "0707c0792223993de583d42144a9e55fb510e6436a67d130d800df23457a1d93";
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring containers cookie deepseq exceptions hashable
|
||||
http-api-data http-media katip lens lifted-base memory
|
||||
monad-control openapi3 safe-exceptions servant servant-auth
|
||||
servant-auth-swagger servant-openapi3 servant-swagger
|
||||
servant-swagger-ui-core string-conv swagger2 text time uuid
|
||||
];
|
||||
homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme";
|
||||
description = "Types and convenience modules use across Hercules CI API packages";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
@ -0,0 +1,39 @@
|
||||
{ mkDerivation, aeson, base, bytestring, containers, cookie
|
||||
, exceptions, hashable, hercules-ci-api-core, hspec, http-api-data
|
||||
, http-media, lens, lens-aeson, lib, memory, network-uri, openapi3
|
||||
, profunctors, protolude, QuickCheck, quickcheck-classes, servant
|
||||
, servant-auth, servant-auth-swagger, servant-openapi3
|
||||
, servant-swagger, servant-swagger-ui-core, string-conv, swagger2
|
||||
, text, time, uuid, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hercules-ci-api";
|
||||
version = "0.8.2.0";
|
||||
sha256 = "d7e5c0f92c614d0251e11aed56544989c612dd2311dc5b6e7b3fa727c187d256";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring containers cookie exceptions hashable
|
||||
hercules-ci-api-core http-api-data http-media lens lens-aeson
|
||||
memory network-uri openapi3 profunctors servant servant-auth
|
||||
servant-auth-swagger servant-openapi3 servant-swagger
|
||||
servant-swagger-ui-core string-conv swagger2 text time uuid
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson base bytestring containers cookie exceptions hashable
|
||||
http-api-data http-media lens memory network-uri openapi3
|
||||
profunctors servant servant-auth servant-auth-swagger
|
||||
servant-openapi3 servant-swagger servant-swagger-ui-core
|
||||
string-conv swagger2 text time uuid
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers exceptions hashable
|
||||
hercules-ci-api-core hspec http-api-data http-media protolude
|
||||
QuickCheck quickcheck-classes servant servant-auth string-conv text
|
||||
time uuid vector
|
||||
];
|
||||
homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme";
|
||||
description = "Hercules CI API definition with Servant";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "hercules-gen-swagger";
|
||||
}
|
@ -0,0 +1,43 @@
|
||||
{ mkDerivation, aeson, aeson-pretty, async, atomic-write
|
||||
, attoparsec, base, bytestring, conduit, containers, data-has
|
||||
, directory, exceptions, filepath, hercules-ci-agent
|
||||
, hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core
|
||||
, hercules-ci-cnix-expr, hercules-ci-cnix-store
|
||||
, hercules-ci-optparse-applicative, hostname, hspec, http-client
|
||||
, http-client-tls, http-types, inline-c-cpp, katip, lens
|
||||
, lens-aeson, lib, lifted-base, monad-control, network-uri, process
|
||||
, protolude, QuickCheck, retry, rio, safe-exceptions, servant
|
||||
, servant-auth-client, servant-client, servant-client-core
|
||||
, servant-conduit, temporary, text, tls, transformers
|
||||
, transformers-base, unix, unliftio, unliftio-core
|
||||
, unordered-containers, uuid
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hercules-ci-cli";
|
||||
version = "0.3.7";
|
||||
sha256 = "bf0a7d9dc26eaff45a1b61f43bef5fb43a8d546b12083f37d450c5b8a7449ec0";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-pretty async atomic-write attoparsec base bytestring
|
||||
conduit containers data-has directory exceptions filepath
|
||||
hercules-ci-agent hercules-ci-api hercules-ci-api-agent
|
||||
hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store
|
||||
hercules-ci-optparse-applicative hostname http-client
|
||||
http-client-tls http-types inline-c-cpp katip lens lens-aeson
|
||||
lifted-base monad-control network-uri process protolude retry rio
|
||||
safe-exceptions servant servant-auth-client servant-client
|
||||
servant-client-core servant-conduit temporary text tls transformers
|
||||
transformers-base unix unliftio unliftio-core unordered-containers
|
||||
uuid
|
||||
];
|
||||
executableHaskellDepends = [ base ];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers hspec protolude QuickCheck
|
||||
unordered-containers
|
||||
];
|
||||
homepage = "https://docs.hercules-ci.com";
|
||||
description = "The hci command for working with Hercules CI";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "hci";
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
{ mkDerivation, aeson, base, boost, bytestring, Cabal
|
||||
, cabal-pkg-config-version-hook, conduit, containers, directory
|
||||
, exceptions, filepath, hercules-ci-cnix-store, hspec
|
||||
, hspec-discover, inline-c, inline-c-cpp, lib, nix, process
|
||||
, protolude, QuickCheck, scientific, temporary, text, unliftio
|
||||
, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hercules-ci-cnix-expr";
|
||||
version = "0.3.6.1";
|
||||
sha256 = "f967e0da57a7aabef256d8843171df51988690036af866537e29ac6ebde76aa5";
|
||||
enableSeparateDataOutput = true;
|
||||
setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ];
|
||||
libraryHaskellDepends = [
|
||||
aeson base bytestring conduit containers directory exceptions
|
||||
filepath hercules-ci-cnix-store inline-c inline-c-cpp protolude
|
||||
scientific text unliftio unordered-containers vector
|
||||
];
|
||||
librarySystemDepends = [ boost ];
|
||||
libraryPkgconfigDepends = [ nix ];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers filepath hercules-ci-cnix-store
|
||||
hspec process protolude QuickCheck scientific temporary text
|
||||
unordered-containers vector
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
homepage = "https://docs.hercules-ci.com";
|
||||
description = "Bindings for the Nix evaluator";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
{ mkDerivation, base, boost, bytestring, Cabal
|
||||
, cabal-pkg-config-version-hook, conduit, containers, exceptions
|
||||
, hspec, hspec-discover, inline-c, inline-c-cpp, lib, nix
|
||||
, protolude, template-haskell, temporary, text, unix, unliftio-core
|
||||
, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hercules-ci-cnix-store";
|
||||
version = "0.3.5.0";
|
||||
sha256 = "395a311514ab5121bf71adc0f67a53b152a091114725fb750c08767a047c7280";
|
||||
setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ];
|
||||
libraryHaskellDepends = [
|
||||
base bytestring conduit containers inline-c inline-c-cpp protolude
|
||||
template-haskell unix unliftio-core vector
|
||||
];
|
||||
librarySystemDepends = [ boost ];
|
||||
libraryPkgconfigDepends = [ nix ];
|
||||
testHaskellDepends = [
|
||||
base bytestring containers exceptions hspec inline-c inline-c-cpp
|
||||
protolude temporary text
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
homepage = "https://docs.hercules-ci.com";
|
||||
description = "Haskell bindings for Nix's libstore";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
37
pkgs/development/haskell-modules/hotfixes/openapi3.nix
Normal file
37
pkgs/development/haskell-modules/hotfixes/openapi3.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
|
||||
, bytestring, Cabal, cabal-doctest, containers, cookie, doctest
|
||||
, generics-sop, Glob, hashable, hspec, hspec-discover, http-media
|
||||
, HUnit, insert-ordered-containers, lens, lib, mtl, optics-core
|
||||
, optics-th, QuickCheck, quickcheck-instances, scientific
|
||||
, template-haskell, text, time, transformers, unordered-containers
|
||||
, utf8-string, uuid-types, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "openapi3";
|
||||
version = "3.2.4";
|
||||
sha256 = "dbcb90464b4712a03c37fa3fcaca3a6784ace2794d85730a8a8c5d9b3ea14ba0";
|
||||
revision = "1";
|
||||
editedCabalFile = "08ikd506fxz3pllg5w8lx9yn9qfqlx9il9xwzz7s17yxn5k3xmnk";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
setupHaskellDepends = [ base Cabal cabal-doctest ];
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-pretty base base-compat-batteries bytestring containers
|
||||
cookie generics-sop hashable http-media insert-ordered-containers
|
||||
lens mtl optics-core optics-th QuickCheck scientific
|
||||
template-haskell text time transformers unordered-containers
|
||||
uuid-types vector
|
||||
];
|
||||
executableHaskellDepends = [ aeson base lens text ];
|
||||
testHaskellDepends = [
|
||||
aeson base base-compat-batteries bytestring containers doctest Glob
|
||||
hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
|
||||
quickcheck-instances template-haskell text time
|
||||
unordered-containers utf8-string vector
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
homepage = "https://github.com/biocad/openapi3";
|
||||
description = "OpenAPI 3.0 data model";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "example";
|
||||
}
|
10
pkgs/development/haskell-modules/hotfixes/update.sh
Executable file
10
pkgs/development/haskell-modules/hotfixes/update.sh
Executable file
@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
cabal2nix cabal://hercules-ci-agent >hercules-ci-agent.nix
|
||||
cabal2nix cabal://hercules-ci-api >hercules-ci-api.nix
|
||||
cabal2nix cabal://hercules-ci-api-agent >hercules-ci-api-agent.nix
|
||||
cabal2nix cabal://hercules-ci-api-core >hercules-ci-api-core.nix
|
||||
cabal2nix cabal://hercules-ci-cli >hercules-ci-cli.nix
|
||||
cabal2nix cabal://hercules-ci-cnix-expr >hercules-ci-cnix-expr.nix
|
||||
cabal2nix cabal://hercules-ci-cnix-store >hercules-ci-cnix-store.nix
|
||||
cabal2nix cabal://openapi3 >openapi3.nix
|
@ -1,3 +1,5 @@
|
||||
{ pkgs, haskellLib }:
|
||||
|
||||
# EXTRA HASKELL PACKAGES NOT ON HACKAGE
|
||||
#
|
||||
# This file should only contain packages that are not in ./hackage-packages.nix.
|
||||
@ -39,4 +41,13 @@ self: super: {
|
||||
# cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
|
||||
hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {};
|
||||
|
||||
# Hotfixes
|
||||
hercules-ci-agent = self.callPackage ./hotfixes/hercules-ci-agent.nix {};
|
||||
hercules-ci-api = self.callPackage ./hotfixes/hercules-ci-api.nix {};
|
||||
hercules-ci-api-agent = self.callPackage ./hotfixes/hercules-ci-api-agent.nix {};
|
||||
hercules-ci-api-core = self.callPackage ./hotfixes/hercules-ci-api-core.nix {};
|
||||
hercules-ci-cli = self.callPackage ./hotfixes/hercules-ci-cli.nix {};
|
||||
hercules-ci-cnix-expr = self.callPackage ./hotfixes/hercules-ci-cnix-expr.nix {};
|
||||
hercules-ci-cnix-store = self.callPackage ./hotfixes/hercules-ci-cnix-store.nix {};
|
||||
openapi3 = self.callPackage ./hotfixes/openapi3.nix {};
|
||||
}
|
||||
|
@ -22,11 +22,6 @@ addToLuaSearchPathWithCustomDelimiter() {
|
||||
# export only if we haven't already got this dir in the search path
|
||||
if [[ ${!varName-} == *"$absPattern"* ]]; then return; fi
|
||||
|
||||
# if the path variable has not yet been set, initialize it to ";;"
|
||||
# this is a magic value that will be replaced by the default,
|
||||
# allowing relative modules to be used even when there are system modules.
|
||||
if [[ -v "${varName}" ]]; then export "${varName}=;;"; fi
|
||||
|
||||
export "${varName}=${!varName:+${!varName};}${absPattern}"
|
||||
}
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2023.08";
|
||||
version = "2024.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rakudo";
|
||||
repo = "rakudo";
|
||||
rev = version;
|
||||
hash = "sha256-wvHMyXMkI2RarmUeC8lKGgy3TNmVQsZo/3D/eS4FUrI=";
|
||||
hash = "sha256-E4YwLds0eoh8PxcACntynQKeg8lRIsEy+JOiv8nF2t0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2023.08";
|
||||
version = "2024.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raku";
|
||||
repo = "nqp";
|
||||
rev = version;
|
||||
hash = "sha256-kVNj6zDT0z6eFxtTovpT1grbl0pygsPKkFoVcFW7baI=";
|
||||
hash = "sha256-vcGj+PKCpCRLyjS158+U42BppJ0Yl53srZCde+fng0c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eccodes";
|
||||
version = "2.34.0";
|
||||
version = "2.34.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
|
||||
sha256 = "sha256-PNIIyN2tEyeJZiz49nqUBVFL/vysrEA8DYyEUH8wOro=";
|
||||
hash = "sha256-+bhoASLjzOwm5u0kqB8bxQ7Z8iMrQx4F5XNniqxNlzQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, doxygen
|
||||
, boost
|
||||
, eigen
|
||||
, assimp
|
||||
@ -14,20 +15,21 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hpp-fcl";
|
||||
version = "2.4.1";
|
||||
version = "2.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "humanoid-path-planner";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Suow6dvDZI0uS/CkzfkWIxYjn+i4Fbyd2EnqlxM2gMY=";
|
||||
hash = "sha256-BwS9RSirdlD6Cqwp7KD59dkh2WsJVwdlH9LzM2AFjI4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DHPP_FCL_HAS_QHULL=ON"
|
||||
"-DINSTALL_DOCUMENTATION=ON"
|
||||
] ++ lib.optionals (!pythonSupport) [
|
||||
"-DBUILD_PYTHON_INTERFACE=OFF"
|
||||
];
|
||||
@ -53,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"hppfcl"
|
||||
];
|
||||
|
||||
outputs = [ "dev" "out" "doc" ];
|
||||
postFixup = ''
|
||||
moveToOutput share/ament_index "$dev"
|
||||
moveToOutput share/${finalAttrs.pname} "$dev"
|
||||
'';
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extension of the Flexible Collision Library";
|
||||
homepage = "https://github.com/humanoid-path-planner/hpp-fcl";
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libcifpp";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PDB-REDO";
|
||||
repo = "libcifpp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-nOKekN3re2Gg7h2RAJ6yRZMfEEk65N2zvb9NafRCVbE=";
|
||||
hash = "sha256-13jJH7YFlnb9hltCo/3kygPkXoE3ZZwZkG/ezbOxE2w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,13 +8,13 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.9.0";
|
||||
version = "3.10.0";
|
||||
pname = "libre";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baresip";
|
||||
repo = "re";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oFaCeVaUrAN83DT8m4gvXSaKzxq5AJw2RHwOelm8HAU=";
|
||||
sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
# Make sure we override python, so the correct version is chosen
|
||||
boostPython = boost.override { enablePython = true; inherit python; };
|
||||
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
|
||||
owner = "arvidn";
|
||||
repo = "libtorrent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kUpeofullQ70uK/YZUD0ikHCquFTGwev7MxBYj0oHeU=";
|
||||
sha256 = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proj";
|
||||
version = "9.3.1";
|
||||
version = "9.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ=";
|
||||
hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sentencepiece";
|
||||
version = "0.1.99";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-RxzysZsfTdhAtJCO3JOa/bSBNnHBRWkqBdwBa8sB74I=";
|
||||
sha256 = "sha256-tMt6UBDqpdjAhxAJlVOFFlE3RC36/t8K0gBAzbesnsg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlcipher";
|
||||
version = "4.5.5";
|
||||
version = "4.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlcipher";
|
||||
repo = "sqlcipher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0=";
|
||||
hash = "sha256-tfDjl1l1vMWZsxFNEPK9jOrUN260/3k2kX6rVHPCZ0k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -4,15 +4,15 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "curly";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz";
|
||||
hash = "sha256-01D1+03CqxLrPoBbNWpSKOzABJf63DhQLA1kRWdueB8=";
|
||||
hash = "sha256-Qn/PKBNOcMt3dk2f7uJD8x0yo4RHobXSjTQck7fcXTw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ result ];
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "odate";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
|
||||
minimalOCamlVersion = "4.07";
|
||||
|
||||
@ -12,16 +12,11 @@ buildDunePackage rec {
|
||||
owner = "hhugo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h";
|
||||
sha256 = "sha256-C11HpftrYOCVyWT31wrqo8FVZuP7mRUkRv5IDeAZ+To=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ menhir ];
|
||||
|
||||
# Ensure compatibility of v0.6 with menhir ≥ 20220210
|
||||
preBuild = ''
|
||||
substituteInPlace dune-project --replace "(using menhir 1.0)" "(using menhir 2.0)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Date and duration in OCaml";
|
||||
inherit (src.meta) homepage;
|
||||
|
@ -4,9 +4,12 @@ let
|
||||
versionData = if (lib.versionOlder php.version "8.1") then {
|
||||
version = "3.0.1";
|
||||
sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914";
|
||||
} else {
|
||||
} else if (lib.versionOlder php.version "8.2") then {
|
||||
version = "3.2.1";
|
||||
sha256 = "zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg=";
|
||||
sha256 = "sha256-zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg=";
|
||||
} else {
|
||||
version = "3.3.0";
|
||||
sha256 = "sha256-0y5VnRKspJYE6xWeBcX2OG2pJTNbB+27GMywDv4gzwQ=";
|
||||
};
|
||||
in
|
||||
buildPecl {
|
||||
|
56
pkgs/development/python-modules/aiodhcpwatcher/default.nix
Normal file
56
pkgs/development/python-modules/aiodhcpwatcher/default.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# build-system
|
||||
, poetry-core
|
||||
|
||||
# dependencies
|
||||
, scapy
|
||||
|
||||
# tests
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiodhcpwatcher";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = "aiodhcpwatcher";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zZigXYUDSbXjlH810CgLa56xWYKcStBeKUbgsZ5WjOw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/addopts =/d" pyproject.toml
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
scapy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiodhcpwatcher"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Watch for DHCP packets with asyncio";
|
||||
homepage = "https://github.com/bdraco/aiodhcpwatcher";
|
||||
changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
@ -9,8 +9,10 @@
|
||||
|
||||
# dependencies
|
||||
, aiohappyeyeballs
|
||||
, async-interrupt
|
||||
, async-timeout
|
||||
, chacha20poly1305-reuseable
|
||||
, cryptography
|
||||
, noiseprotocol
|
||||
, protobuf
|
||||
, zeroconf
|
||||
@ -23,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "21.0.2";
|
||||
version = "23.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -32,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-uNVf0wnqVntjTxkNTilvb0v6h3VBCjd91wbLQJ6q71g=";
|
||||
hash = "sha256-iYaRA1Jj9Ew/s/LyS6U+NZ3TsAlXdDq0DAaudgFV5/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -42,7 +44,9 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohappyeyeballs
|
||||
async-interrupt
|
||||
chacha20poly1305-reuseable
|
||||
cryptography
|
||||
noiseprotocol
|
||||
protobuf
|
||||
zeroconf
|
||||
@ -56,6 +60,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/esphome/aioesphomeapi/issues/837
|
||||
"test_reconnect_logic_stop_callback"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aioesphomeapi"
|
||||
];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "aiohttp_client_cache";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-FXU4QNqa8B8ZADmoEyJfd8gsUDI0HEjIR9B2CBP55wU=";
|
||||
sha256 = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s=";
|
||||
};
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
|
@ -3,19 +3,23 @@
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, ciso8601
|
||||
, fetchFromGitHub
|
||||
, frozenlist
|
||||
, mashumaro
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pyjwt
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pythonOlder
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aionotion";
|
||||
version = "2023.12.0";
|
||||
version = "2024.02.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-F9Mv8c+QEd+Vi5pdNDAFzRnYoNKZSAN5qbeX7yG6kIk=";
|
||||
hash = "sha256-xehHOB4iUMT1kKEK4jQzaj7hH9fmiY7mZxGC3CLnpAs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -34,7 +38,11 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
certifi
|
||||
pydantic
|
||||
ciso8601
|
||||
frozenlist
|
||||
mashumaro
|
||||
pyjwt
|
||||
yarl
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
@ -4,11 +4,12 @@
|
||||
, flit-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosqlite";
|
||||
version = "0.19.0";
|
||||
version = "0.20.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,13 +18,17 @@ buildPythonPackage rec {
|
||||
owner = "omnilib";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dm7uqG59FP40hcQt+R7qfQiD8P42AYZ2WcH1RoEC5wQ=";
|
||||
hash = "sha256-JQ9iNxK7FvBhPyr825d+8P5ZYFztDIX3gOwp4FPfyU4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
let
|
||||
pname = "ansible";
|
||||
version = "9.2.0";
|
||||
version = "9.3.0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -31,7 +31,7 @@ buildPythonPackage {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ogekoApF5c0Xin+UykKv4m8jydJ75JkB6oxF0YoHt8Y=";
|
||||
hash = "sha256-f06g5NBlU4h5s+Eegehe7U2ALRlA9lZK2VDp0RoxsDw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -9,12 +9,12 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "autoflake";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Yre2RJppLDybDJFpGbvCFkjacoHoUGvPjT+CgOQx68E=";
|
||||
hash = "sha256-jCAR+jRwG519zwW5hzvEhZ1Pzk5i3+qQ3/79FXb18B0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "axis";
|
||||
version = "48";
|
||||
version = "50";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/Iz1F40Y00bgJUvNrkPGyA8Kkch92Kijeg8TQ8mostM=";
|
||||
hash = "sha256-Zu8hT6t7ZxlgXQKb2o20FpB15n9y/+n1qMctzcRP8F8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.38.0";
|
||||
version = "0.38.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7aqzhujTn1TMYBA6+79Ok76yv8hXszuuZ7TjhJ6zbQw=";
|
||||
hash = "sha256-oxPzjDb+FdHeHsgeGKH3SVvKb0vCB9dIhT7lGzhDcBw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -11,12 +11,13 @@
|
||||
, pynacl
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bip-utils";
|
||||
version = "2.9.2";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -27,6 +28,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-qK1jSVfkebB9JM0sZjOu7ABc7xMrcybu1r7oQOw3bJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ecdsa
|
||||
cbor2
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bleak-esphome";
|
||||
version = "0.4.1";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "bluetooth-devices";
|
||||
repo = "bleak-esphome";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cLjQg54DL17VtM/NFOQUE0dJThz5EhjipW2t9yhAMQ0=";
|
||||
hash = "sha256-zz7vh+UIahHtb6ZjR/eRrS9RGur2klqbgKoeJpMrH/k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Bleak backend of ESPHome";
|
||||
homepage = "https://github.com/bluetooth-devices/bleak-esphome";
|
||||
changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
@ -365,14 +365,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.56";
|
||||
version = "1.34.57";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Yn+OymnYMlge4WdtOd8JmiouOobWs+vSHIHF8R7Wpvo=";
|
||||
hash = "sha256-K3Jxu2h23GprPx5hlEcdpd6qks6cTuVqv0LeDcOb5FY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,25 +2,20 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bumps";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-J8NeV9FCUC5dLkosBzVrovxiJJbeuj8Xc50NGEI9Bms=";
|
||||
hash = "sha256-PhoxjnkeLGL8vgEp7UubXKlS8p44TUkJ3c4SqRjKFJA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chart-studio";
|
||||
version = "5.18.0";
|
||||
version = "5.19.0";
|
||||
pyproject = true;
|
||||
|
||||
# chart-studio was split from plotly
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hY8R4UjcTI5RBaaRU/oR63taKEgYRI3+oOxNuDWzg20=";
|
||||
hash = "sha256-Xi1Sf07TLPv6TsmsR2WDfY9NYdglpwiu22RjMiktTdw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/packages/python/chart-studio";
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chispa";
|
||||
version = "0.9.4";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "MrPowers";
|
||||
repo = "chispa";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VF7k0u7QpoG3PXvU5M7jrM9pht6xeRUpYH9znMdLOxk=";
|
||||
hash = "sha256-r3/Uae/Bu/+ZpWt19jetfIRpew1hBB24WWQRJIcYqFs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dataclasses-json";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "lidatong";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UVYLyRVLRdt38obSLkSsQdroO95lwpwzerw+gYBIJ7w=";
|
||||
hash = "sha256-izNDvljUWw60joi5WfCfoqL5SDM8Jz5Pz+lI/RP35n8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-crispy-bootstrap5";
|
||||
version = "2023.10";
|
||||
version = "2024.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django-crispy-forms";
|
||||
repo = "crispy-bootstrap5";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-AUMlLj3GmI+0vYw56Dw2+iF5s1l6GF+zV7PRD889ldg=";
|
||||
hash = "sha256-ehcDwy53pZCqouvUm6qJG2FJzlFZaygTZxNYPOqH1q0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -32,16 +32,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "3.41.1";
|
||||
version = "3.42.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PbgazRK3+CoJISh1ZXGjxDfbKHY/XqSvVrkpycvPi7c=";
|
||||
hash = "sha256-7MesRCfXr/f2MBokZhraFQqIuOyWCjIDRYZcvzM5Ezc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,26 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
, georss-client
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "georss-ign-sismologia-client";
|
||||
version = "0.6";
|
||||
format = "setuptools";
|
||||
version = "0.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-georss-ign-sismologia-client";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OLX6Megl5l8KDnd/G16QJ/wQn5AQc2cZ+LCbjuHFbwo=";
|
||||
hash = "sha256-geIxF4GumxRoetJ6mIZCzI3pAvWjJJoY66aQYd2Mzik=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dateparser
|
||||
georss-client
|
||||
];
|
||||
|
||||
|
@ -4,22 +4,27 @@
|
||||
, georss-client
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "georss-qld-bushfire-alert-client";
|
||||
version = "0.6";
|
||||
format = "setuptools";
|
||||
version = "0.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-georss-qld-bushfire-alert-client";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7KVR0hdLwyCj7MYJoRvQ6wTeJQAmCUarYxJXEFaN8Pc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ajCw1m7Qm1kZE/hOsBzFXPWAxl/pFD8pOOQo6qvachE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
georss-client
|
||||
];
|
||||
@ -35,6 +40,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python library for accessing Queensland Bushfire Alert feed";
|
||||
homepage = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client";
|
||||
changelog = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glfw";
|
||||
version = "2.6.5";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "FlorianRhiem";
|
||||
repo = "pyGLFW";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mh2l63Nt9YMCPM3AplKWPx5HQZi2/cm+dUS56JB8fGA=";
|
||||
hash = "sha256-9SNq8jKzgzFzonyMYoyjGbz4NDL83dPKWID9m3HZ7B8=";
|
||||
};
|
||||
|
||||
# Patch path to GLFW shared object
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "habanero";
|
||||
version = "1.2.3";
|
||||
version = "1.2.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "sckott";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IQp85Cigs0in3X07a9d45nMC3X2tAkPzl5hFVhfr00o=";
|
||||
hash = "sha256-Pw0TgXxDRmR565hdNGipfDZ7P32pxWkmPWfaYK0RaI4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.43";
|
||||
version = "0.44";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "vacanza";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8Qm8hzGVkaYLwqUcqUxcY4iDR1jrhnSoBS8E2Wewb+U=";
|
||||
hash = "sha256-RwM4RtFIUSaM/e4kiHOMg97lZ4VknB1pOqGRuIe2ns8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -6,40 +6,32 @@
|
||||
, tzdata
|
||||
, pyparsing
|
||||
, pydantic
|
||||
, pytest-asyncio
|
||||
, pytest-benchmark
|
||||
, pytest-golden
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, python-dateutil
|
||||
, pyyaml
|
||||
, setuptools
|
||||
, syrupy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ical";
|
||||
version = "6.1.1";
|
||||
version = "7.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allenporter";
|
||||
repo = pname;
|
||||
repo = "ical";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pFmJYXIhc9jhpc9ZjSNaol5h5Jb8ZvxuQsQL/2Rjryc=";
|
||||
hash = "sha256-S/6zyUFXSWcnnLNSwz1smovSyodhKeRVbT9lj7+KLWo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"tzdata"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
tzdata
|
||||
@ -50,11 +42,9 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
emoji
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
pytest-benchmark
|
||||
pytest-golden
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
syrupy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
@ -20,7 +20,7 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "jaxtyping";
|
||||
version = "0.2.26";
|
||||
version = "0.2.27";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -29,7 +29,7 @@ let
|
||||
owner = "google";
|
||||
repo = "jaxtyping";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2QDTRNH2/9FPU5xrQx7yZRHwEWqj0PUNzcCuKwY4yNg=";
|
||||
hash = "sha256-FDXNPu8HZUpT5ij6evc/LKVXAvcDDE9PmOXS7WmADpQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsbeautifier";
|
||||
version = "1.14.11";
|
||||
version = "1.15.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-a2Mlgepg3RwTPNJaSK0Ye0uR9SZiPEsPtUQ++AUlBQU=";
|
||||
hash = "sha256-69cztWBwTGAtdE6vyDnbYKHukybjCiqAxK24cYrcGyQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labelbox";
|
||||
version = "3.58.1";
|
||||
version = "3.65";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -33,8 +33,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Labelbox";
|
||||
repo = "labelbox-python";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-H6fn+TpfYbu/warhr9XcQjfxSThIjBp9XwelA5ZvTBE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i0hbVxGrb2C/bMcVPNzaPBxhKm+5r3o1GlToZvIS35k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -99,7 +99,5 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rakesh4g ];
|
||||
# https://github.com/Labelbox/labelbox-python/issues/1246
|
||||
broken = versionAtLeast pydantic.version "2";
|
||||
};
|
||||
}
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mdformat-admon";
|
||||
version = "1.0.2";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,8 +18,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KyleKing";
|
||||
repo = "mdformat-admon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MRcNExMPH/HIXB2DmN9fA89plo0IZPWXryySK9OZHg8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-material";
|
||||
version = "9.5.6";
|
||||
version = "9.5.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = "squidfunk";
|
||||
repo = "mkdocs-material";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-t+kS/MZ6kfga+LPSBj0h+vkY/u/bd3iqRUyOHXfrwDU=";
|
||||
hash = "sha256-SFLCNFJNlyJ09d4VsWsxdw7Ctyv1pFHXdqPgBflH294=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mujoco";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
# in the project's CI.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-U1MLwakZA/P9Sx6ZgYzDj72ZEXANspssn8g58jv6y7g=";
|
||||
hash = "sha256-9wDQdAMQYLRhEd22BDLQBCX4Ie7q8MzHbtldR4Yb1N4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake setuptools ];
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mysqlclient";
|
||||
version = "2.2.1";
|
||||
version = "2.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LHrRW4cpOxL9RLR8RoeeyV7GR/RWfoZszXC4M3WE6bI=";
|
||||
hash = "sha256-7lFlbjb8WpKSC4B+6Lnjc+Ow4mfInNyV1zsdvkaGNjE=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oci";
|
||||
version = "2.122.0";
|
||||
version = "2.124.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "oracle";
|
||||
repo = "oci-python-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DDUnstgyRgt7sNcGV6gqJoTzmbBCMDTjmvf2zIXpBO8=";
|
||||
hash = "sha256-/I86zjhQsDYljgde7L2lPFHiMykRmOgNOaqk5SxNMlg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plac";
|
||||
version = "1.4.0";
|
||||
version = "1.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "ialbert";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BH6NKbDMhlNuo+orIEweABNSVZv1K9VrZBrCIs6H6BU=";
|
||||
hash = "sha256-EWwDtS2cRLBe4aZuH72hgg2BQnVJQ39GmPx05NxTNjE=";
|
||||
};
|
||||
|
||||
# tests are broken, see https://github.com/ialbert/plac/issues/74
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plotnine";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "has2k1";
|
||||
repo = "plotnine";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qhmo1Ckc4OUzWCnjCNQvwsExB98/BCKydMZdB/yfOY0=";
|
||||
hash = "sha256-VgR7T8pDrVMBYqtvTfRmFwW61IREYiRCMXbpCOj/a4Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -87,6 +87,7 @@ buildPythonPackage rec {
|
||||
"tests/test_geom_smooth.py"
|
||||
"tests/test_geom_text_label.py"
|
||||
"tests/test_geom_violin.py"
|
||||
"tests/test_layout.py"
|
||||
"tests/test_position.py"
|
||||
"tests/test_qplot.py"
|
||||
"tests/test_scale_internals.py"
|
||||
|
@ -4,32 +4,39 @@
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, protobuf
|
||||
, requests
|
||||
, setuptools
|
||||
, wheel
|
||||
, zeroconf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pychromecast";
|
||||
version = "13.1.0";
|
||||
format = "setuptools";
|
||||
version = "14.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyChromecast";
|
||||
inherit version;
|
||||
hash = "sha256-COYai1S9IRnTyasewBNtPYVjqpfgo7V4QViLm+YMJnY=";
|
||||
hash = "sha256-3E+LBS52CpeNqbJWi3kCDLea9gigJkZfB1RM/+Q5c88=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "protobuf>=3.19.1,<4" "protobuf>=3.19.1"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools~=65.6" "setuptools" \
|
||||
--replace-fail "wheel~=0.37.1" "wheel" \
|
||||
--replace-fail "protobuf>=4.25.1" "protobuf"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
casttube
|
||||
protobuf
|
||||
requests
|
||||
zeroconf
|
||||
];
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydevccu";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wzltcerAGh/QfHGg+M7Hlw4SfDEg23K2plSyrmz/m7E=";
|
||||
hash = "sha256-WguSTtWxkiDs5nK5eiaarfD0CBxzIxQR9fxjuW3wMGc=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ lib
|
||||
, authlib
|
||||
, buildPythonPackage
|
||||
, dataclasses-json
|
||||
, fetchFromGitHub
|
||||
, httpx
|
||||
, marshmallow
|
||||
, mashumaro
|
||||
, orjson
|
||||
, pytest-httpx
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydiscovergy";
|
||||
version = "2.0.5";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -24,24 +24,24 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpbede";
|
||||
repo = "pydiscovergy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u2G+o/vhPri7CPSnekC8rUo/AvuvePpG51MR+FdH2XA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ArcH/4ZyOtIGmoXArU+oEd357trJnS9umlN9B+U0dBI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/addopts =/d' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pytz"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
authlib
|
||||
dataclasses-json
|
||||
httpx
|
||||
marshmallow
|
||||
mashumaro
|
||||
orjson
|
||||
pytz
|
||||
];
|
||||
|
||||
@ -58,7 +58,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Async Python 3 library for interacting with the Discovergy API";
|
||||
homepage = "https://github.com/jpbede/pydiscovergy";
|
||||
changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/${version}";
|
||||
changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydyf";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sise8BYUG1SUGtZu1OA2p73/OcCzYJk7KDh1w/hU3Zo=";
|
||||
hash = "sha256-1bJE6PwkEZznvV1R6i1nc8D/iKqBWX21VrxEDGuIBhA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -15,11 +15,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyipv8";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FXvMykUko3v0GmAZYUt5esBuTbxqpjOL4YxrRfE3u5o=";
|
||||
hash = "sha256-Qp5vqMa7kfSp22C5KAUvut+4YbSXMEZRsHsLevB4QvE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.7.0";
|
||||
version = "6.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HoTtvda97ghQ0SQBZFGkDAwD2WNtZpIum2m1khivEK4=";
|
||||
hash = "sha256-eTItw+wYo5lCla4oKSF97N4TFajjFtCMMq4DU9ahi1U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -83,6 +83,9 @@ buildPythonPackage rec {
|
||||
"test_sync_download__directory"
|
||||
"test_sync_download__system_directory"
|
||||
"test_transformer_group__download_grids"
|
||||
|
||||
# proj-data grid required
|
||||
"test_azimuthal_equidistant"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user