Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e8dd554943
|
|
@ -40,6 +40,7 @@ in
|
|||
after = [ "network.target" ];
|
||||
environment = {
|
||||
INFLUXD_CONFIG_PATH = configFile;
|
||||
ZONEINFO = "${pkgs.tzdata}/share/zoneinfo";
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/influxd --bolt-path \${STATE_DIRECTORY}/influxd.bolt --engine-path \${STATE_DIRECTORY}/engine";
|
||||
|
|
|
|||
|
|
@ -263,6 +263,15 @@ in {
|
|||
|
||||
serve = {
|
||||
enable = mkEnableOption (lib.mdDoc "Automatic nginx and uwsgi setup for mailman-web");
|
||||
|
||||
virtualRoot = mkOption {
|
||||
default = "/";
|
||||
example = lib.literalExpression "/lists";
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
Path to mount the mailman-web django application on.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
extraPythonPackages = mkOption {
|
||||
|
|
@ -433,8 +442,8 @@ in {
|
|||
enable = mkDefault true;
|
||||
virtualHosts = lib.genAttrs cfg.webHosts (webHost: {
|
||||
locations = {
|
||||
"/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
|
||||
"/static/".alias = webSettings.STATIC_ROOT + "/";
|
||||
${cfg.serve.virtualRoot}.extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;";
|
||||
"${cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
@ -561,7 +570,8 @@ in {
|
|||
type = "normal";
|
||||
plugins = ["python3"];
|
||||
home = webEnv;
|
||||
module = "mailman_web.wsgi";
|
||||
manage-script-name = true;
|
||||
mount = "${cfg.serve.virtualRoot}=mailman_web.wsgi:application";
|
||||
http = "127.0.0.1:18507";
|
||||
};
|
||||
uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig);
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ in
|
|||
description = "Synergy server";
|
||||
wantedBy = optional cfgS.autoStart "graphical-session.target";
|
||||
path = [ pkgs.synergy ];
|
||||
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert=${cfgS.tls.cert}")}'';
|
||||
serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f${optionalString (cfgS.address != "") " -a ${cfgS.address}"}${optionalString (cfgS.screenName != "") " -n ${cfgS.screenName}"}${optionalString cfgS.tls.enable " --enable-crypto"}${optionalString (cfgS.tls.cert != null) (" --tls-cert ${cfgS.tls.cert}")}'';
|
||||
serviceConfig.Restart = "on-failure";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ with lib;
|
|||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.node;
|
||||
collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors;
|
||||
collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors;
|
||||
in
|
||||
{
|
||||
port = 9100;
|
||||
|
|
@ -35,15 +37,15 @@ in
|
|||
${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
|
||||
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
|
||||
'';
|
||||
RestrictAddressFamilies = optionals (any (collector: (collector == "logind" || collector == "systemd")) cfg.enabledCollectors) [
|
||||
RestrictAddressFamilies = optionals (collectorIsEnabled "logind" || collectorIsEnabled "systemd") [
|
||||
# needs access to dbus via unix sockets (logind/systemd)
|
||||
"AF_UNIX"
|
||||
] ++ optionals (any (collector: (collector == "network_route" || collector == "wifi")) cfg.enabledCollectors) [
|
||||
] ++ optionals (collectorIsEnabled "network_route" || collectorIsEnabled "wifi" || ! collectorIsDisabled "netdev") [
|
||||
# needs netlink sockets for wireless collector
|
||||
"AF_NETLINK"
|
||||
];
|
||||
# The timex collector needs to access clock APIs
|
||||
ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors;
|
||||
ProtectClock = collectorIsDisabled "timex";
|
||||
# Allow space monitoring under /home
|
||||
ProtectHome = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
|
||||
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome
|
||||
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
|
||||
# High-DPI support: Spotify's --force-device-scale-factor argument
|
||||
# not added if `null`, otherwise, should be a number.
|
||||
, deviceScaleFactor ? null
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -67,7 +70,7 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "spotify-unwrapped";
|
||||
pname = "spotify";
|
||||
inherit version;
|
||||
|
||||
# fetch from snapcraft instead of the debian repository most repos fetch from.
|
||||
|
|
@ -143,6 +146,9 @@ stdenv.mkDerivation {
|
|||
librarypath="${lib.makeLibraryPath deps}:$libdir"
|
||||
wrapProgram $out/share/spotify/spotify \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
${lib.optionalString (deviceScaleFactor != null) ''
|
||||
--add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \
|
||||
''} \
|
||||
--prefix LD_LIBRARY_PATH : "$librarypath" \
|
||||
--prefix PATH : "${gnome.zenity}/bin"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
{ symlinkJoin
|
||||
, lib
|
||||
, spotify-unwrapped
|
||||
, makeWrapper
|
||||
|
||||
# High-DPI support: Spotify's --force-device-scale-factor argument; not added
|
||||
# if `null`, otherwise, should be a number.
|
||||
, deviceScaleFactor ? null
|
||||
}:
|
||||
|
||||
symlinkJoin {
|
||||
name = "spotify-${spotify-unwrapped.version}";
|
||||
|
||||
paths = [ spotify-unwrapped.out ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
preferLocalBuild = true;
|
||||
passthru.unwrapped = spotify-unwrapped;
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/spotify \
|
||||
${lib.optionalString (deviceScaleFactor != null) ''
|
||||
--add-flags ${lib.escapeShellArg "--force-device-scale-factor=${
|
||||
builtins.toString deviceScaleFactor
|
||||
}"}
|
||||
''}
|
||||
'';
|
||||
|
||||
meta = spotify-unwrapped.meta // {
|
||||
priority = (spotify-unwrapped.meta.priority or 0) - 1;
|
||||
};
|
||||
}
|
||||
|
|
@ -25,14 +25,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foxotron";
|
||||
version = "2022-08-06";
|
||||
version = "2022-11-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gargaj";
|
||||
repo = "Foxotron";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-IGLoiUeHcTlQ+WJTot3o5/Q+jRJcY52I3xHDAT0zuIU=";
|
||||
sha256 = "sha256-WjsVvFhwVCzclHxA+Gu2YtR2yK0Opqhncwlg9FEhOLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dmenu-wayland-unstable";
|
||||
version = "2020-07-06";
|
||||
version = "2022-11-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nyyManni";
|
||||
repo = "dmenu-wayland";
|
||||
rev = "304c8e917651ee02b16ebf0b7097a5c53fa2236b";
|
||||
sha256 = "0rkpmpk7xkcfbnv9vpg8n65423z5xpgp0hm2vg0rxf9354bjin7k";
|
||||
rev = "b60047236ef7a4e5dcde6c4ac0dcfaa070d90041";
|
||||
sha256 = "sha256-CeJWLBPAzE3JITVuS6f4CQxLz9v09WvfG3O0wErJJS4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, blueprint-compiler
|
||||
, desktop-file-utils
|
||||
, gobject-introspection
|
||||
, meson
|
||||
|
|
@ -16,17 +17,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "junction";
|
||||
version = "1.5.0";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sonnyp";
|
||||
repo = "junction";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jS4SHh1BB8jk/4EP070X44C4n3GjyCz8ozgK8v5lbqc=";
|
||||
sha256 = "sha256-95lKap0VKLxX5Vax2tK0cAcJ/XgQddoN46tXHo+MtYc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib
|
||||
blueprint-compiler
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
meson
|
||||
|
|
@ -42,12 +45,25 @@ stdenv.mkDerivation rec {
|
|||
libportal-gtk4
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# gjs uses the invocation name to add gresource files
|
||||
# - https://gitlab.gnome.org/GNOME/gjs/-/blob/6aca7b50785fa1638f144b17060870d721e3f65a/modules/script/package.js#L159
|
||||
# - https://gitlab.gnome.org/GNOME/gjs/-/blob/6aca7b50785fa1638f144b17060870d721e3f65a/modules/script/package.js#L37
|
||||
# To work around this, we manually set the the name as done in foliate
|
||||
# - https://github.com/NixOS/nixpkgs/blob/3bacde6273b09a21a8ccfba15586fb165078fb62/pkgs/applications/office/foliate/default.nix#L23
|
||||
sed -i "1 a imports.package._findEffectiveEntryPointName = () => 're.sonny.Junction';" src/bin.js
|
||||
|
||||
# /usr/bin/env is not accessible in build environment
|
||||
substituteInPlace troll/gjspack/bin/gjspack --replace "/usr/bin/env -S gjs" "${gjs}/bin/gjs"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# autoPatchShebangs does not like "/usr/bin/env -S gjs"
|
||||
substituteInPlace $out/bin/re.sonny.Junction --replace "/usr/bin/env -S gjs" "/usr/bin/gjs"
|
||||
# autoPatchShebangs does not like "/usr/bin/env -S <environment-setting> gjs -m"
|
||||
sed -i "1s|.*|#!/usr/bin/gjs -m|" $out/bin/re.sonny.Junction
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
mainProgram = "re.sonny.Junction";
|
||||
description = "Choose the application to open files and links";
|
||||
homepage = "https://apps.gnome.org/en/app/re.sonny.Junction/";
|
||||
license = licenses.gpl3Plus;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.20.0";
|
||||
version = "3.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jBpapZIQGYC63SEc4kT6pEbNR3H1IQFM7P/wxMlrP8I=";
|
||||
sha256 = "sha256-S07v9SATmE7gqM7+X/eWBG5A+h8lAKJ6mPvU7ImEfN4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iY4Q1P4Mir6idcv88Op5v0kQ7PkoOm85aCBb845xvGs=";
|
||||
vendorSha256 = "sha256-h3UOFs7pxf9gwVAcjih8Kxr0b+68W1DanYoTpmeirg8=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
, fixup_yarn_lock
|
||||
, nodejs
|
||||
, jitsi-meet
|
||||
, applyPatches
|
||||
, conf ? { }
|
||||
}:
|
||||
|
||||
|
|
@ -25,14 +24,11 @@ in stdenv.mkDerivation rec {
|
|||
pname = "element-web";
|
||||
inherit (pinData) version;
|
||||
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub {
|
||||
owner = "vector-im";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = pinData.webSrcHash;
|
||||
};
|
||||
patches = [ ./regenerate-element-web-yarn.lock.diff ];
|
||||
src = fetchFromGitHub {
|
||||
owner = "vector-im";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = pinData.webSrcHash;
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "1.11.12",
|
||||
"desktopSrcHash": "85mH9y3/IlThrdZY4Nv6iZQ8SxVGoYcZ1bbkCuAAroU=",
|
||||
"version": "1.11.13",
|
||||
"desktopSrcHash": "E8jpv7cJf8qdR4I3n7id5hUysAiMVvwyqUqHzGnVUJE=",
|
||||
"desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5",
|
||||
"webSrcHash": "MfiPrTw7BFLFPbm6xR5QbQHNPYpaJBtZES6KjISMTeE=",
|
||||
"webYarnHash": "sha256-KZNBocVEs3wD5020h6C4n2jgp4shv4IgFENSi87rUFM="
|
||||
"webSrcHash": "985nxLIOZvrUX11AJDXYRMwC76/aP9ruSCqL47c7ZRM=",
|
||||
"webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
diff --git a/yarn.lock b/yarn.lock
|
||||
index 1581f599f..910764c86 100644
|
||||
--- a/yarn.lock
|
||||
+++ b/yarn.lock
|
||||
@@ -3150,6 +3150,11 @@ brorand@^1.0.1, brorand@^1.1.0:
|
||||
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
|
||||
integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
|
||||
|
||||
+browser-request@^0.3.3:
|
||||
+ version "0.3.3"
|
||||
+ resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
|
||||
+ integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==
|
||||
+
|
||||
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
|
||||
@@ -8177,7 +8182,6 @@ matrix-js-sdk@21.0.0:
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
another-json "^0.2.0"
|
||||
- browser-request "^0.3.3"
|
||||
bs58 "^5.0.0"
|
||||
content-type "^1.0.4"
|
||||
loglevel "^1.7.1"
|
||||
@@ -8208,7 +8212,6 @@ matrix-react-sdk@3.59.0:
|
||||
"@types/ua-parser-js" "^0.7.36"
|
||||
await-lock "^2.1.0"
|
||||
blurhash "^1.1.3"
|
||||
- browser-request "^0.3.3"
|
||||
cheerio "^1.0.0-rc.9"
|
||||
classnames "^2.2.6"
|
||||
commonmark "^0.29.3"
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
, range-v3
|
||||
, tl-expected
|
||||
, hunspell
|
||||
, glibmm
|
||||
, glibmm_2_68
|
||||
, webkitgtk_4_1
|
||||
, jemalloc
|
||||
, rnnoise
|
||||
|
|
@ -74,7 +74,7 @@ let
|
|||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "4.2.4";
|
||||
version = "4.3.0";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
|
|
@ -83,7 +83,7 @@ env.mkDerivation rec {
|
|||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-X2ZbjlL3YbPdXSgS+wqZL3FUW2xQ0DhqiOO5MR1QyLY=";
|
||||
sha256 = "1ji9351vcvydkcrdwqx22j1nhl9vysd6ajvghaqxdirvqypiygj0";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -131,7 +131,7 @@ env.mkDerivation rec {
|
|||
range-v3
|
||||
tl-expected
|
||||
hunspell
|
||||
glibmm
|
||||
glibmm_2_68
|
||||
webkitgtk_4_1
|
||||
jemalloc
|
||||
rnnoise
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "2022-09-20";
|
||||
version = "2022-11-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "Ce8LTIxKabeqV9QVK68DqUVwtwG5lyxDPDQx0mLIr5o=";
|
||||
sha256 = "kKl/E2L1NL1U7PHbva+wUqQGbcHFbPgZBVhU/OgEuAE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 jdupes ];
|
||||
|
|
|
|||
|
|
@ -1,108 +1,99 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, abseil-cpp
|
||||
{ abseil-cpp
|
||||
, bzip2
|
||||
, zlib
|
||||
, lsb-release
|
||||
, which
|
||||
, protobuf
|
||||
, cbc
|
||||
, cmake
|
||||
, eigen
|
||||
, ensureNewerSourcesForZipFilesHook
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, glpk
|
||||
, lib
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, python
|
||||
, re2
|
||||
, stdenv
|
||||
, swig4
|
||||
, unzip
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "or-tools";
|
||||
version = "9.1";
|
||||
disabled = python.pythonOlder "3.6"; # not supported upstream
|
||||
version = "9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "or-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dEYMPWpa3J9EqtCq3kubdUYJivNRTOKUpNDx3UC1IcQ=";
|
||||
sha256 = "sha256-joWonJGuxlgHhXLznRhC1MDltQulXzpo4Do9dec1bLY=";
|
||||
};
|
||||
|
||||
# The original build system uses cmake which does things like pull
|
||||
# in dependencies through git and Makefile creation time. We
|
||||
# obviously don't want to do this so instead we provide the
|
||||
# dependencies straight from nixpkgs and use the make build method.
|
||||
|
||||
# Cbc is linked against bzip2 and declares this in its pkgs-config file,
|
||||
# but this makefile doesn't use pkgs-config, so we also have to add lbz2
|
||||
configurePhase = ''
|
||||
substituteInPlace makefiles/Makefile.third_party.unix.mk \
|
||||
--replace 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK)' \
|
||||
'COINUTILS_LNK = $(STATIC_COINUTILS_LNK) -lbz2'
|
||||
|
||||
cat <<EOF > Makefile.local
|
||||
UNIX_ABSL_DIR=${abseil-cpp}
|
||||
UNIX_PROTOBUF_DIR=${protobuf}
|
||||
UNIX_CBC_DIR=${cbc}
|
||||
USE_SCIP=OFF
|
||||
EOF
|
||||
'';
|
||||
|
||||
# Many of these 'samples' (which are really the tests) require using SCIP, and or-tools 8.1
|
||||
# will just crash if SCIP is not found because it doesn't fall back to using one of
|
||||
# the available solvers: https://github.com/google/or-tools/blob/b77bd3ac69b7f3bb02f55b7bab6cbb4bab3917f2/ortools/linear_solver/linear_solver.cc#L427
|
||||
# We don't compile with SCIP because it does not have an open source license.
|
||||
# See https://github.com/google/or-tools/issues/2395
|
||||
preBuild = ''
|
||||
for file in ortools/linear_solver/samples/*.cc; do
|
||||
if grep -q SCIP_MIXED_INTEGER_PROGRAMMING $file; then
|
||||
substituteInPlace $file --replace SCIP_MIXED_INTEGER_PROGRAMMING CBC_MIXED_INTEGER_PROGRAMMING
|
||||
fi;
|
||||
done
|
||||
|
||||
substituteInPlace ortools/linear_solver/samples/simple_mip_program.cc \
|
||||
--replace 'SCIP' 'CBC'
|
||||
'';
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
"PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py"
|
||||
patches = [
|
||||
# Disable test that requires external input: https://github.com/google/or-tools/issues/3429
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/or-tools/commit/7072ae92ec204afcbfce17d5360a5884c136ce90.patch";
|
||||
hash = "sha256-iWE+atp308q7pC1L1FD6sK8LvWchZ3ofxvXssguozbM=";
|
||||
})
|
||||
# Fix test that broke in parallel builds: https://github.com/google/or-tools/issues/3461
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/or-tools/commit/a26602f24781e7bfcc39612568aa9f4010bb9736.patch";
|
||||
hash = "sha256-gM0rW0xRXMYaCwltPK0ih5mdo3HtX6mKltJDHe4gbLc=";
|
||||
})
|
||||
];
|
||||
buildFlags = [ "cc" "pypi_archive" ];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test_cc";
|
||||
|
||||
installTargets = [ "install_cc" ];
|
||||
# The upstream install_python target installs to $HOME.
|
||||
postInstall = ''
|
||||
mkdir -p "$python/${python.sitePackages}"
|
||||
(cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python')
|
||||
'';
|
||||
|
||||
# protobuf generation is not thread safe
|
||||
enableParallelBuilding = false;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_DEPS=OFF"
|
||||
"-DBUILD_PYTHON=ON"
|
||||
"-DBUILD_pybind11=OFF"
|
||||
"-DFETCH_PYTHON_DEPS=OFF"
|
||||
"-DUSE_GLPK=ON"
|
||||
"-DUSE_SCIP=OFF"
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
lsb-release
|
||||
swig4
|
||||
which
|
||||
ensureNewerSourcesForZipFilesHook
|
||||
python.pkgs.setuptools
|
||||
python.pkgs.wheel
|
||||
pkg-config
|
||||
python
|
||||
python.pkgs.pip
|
||||
swig4
|
||||
unzip
|
||||
];
|
||||
buildInputs = [
|
||||
zlib
|
||||
bzip2
|
||||
python
|
||||
cbc
|
||||
eigen
|
||||
glpk
|
||||
python.pkgs.absl-py
|
||||
python.pkgs.mypy-protobuf
|
||||
python.pkgs.pybind11
|
||||
python.pkgs.setuptools
|
||||
python.pkgs.wheel
|
||||
re2
|
||||
zlib
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
abseil-cpp
|
||||
protobuf
|
||||
|
||||
python.pkgs.protobuf
|
||||
python.pkgs.six
|
||||
python.pkgs.absl-py
|
||||
python.pkgs.mypy-protobuf
|
||||
python.pkgs.numpy
|
||||
];
|
||||
checkInputs = [
|
||||
python.pkgs.matplotlib
|
||||
python.pkgs.pandas
|
||||
python.pkgs.virtualenv
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# This extra configure step prevents the installer from littering
|
||||
# $out/bin with sample programs that only really function as tests,
|
||||
# and disables the upstream installation of a zipped Python egg that
|
||||
# can’t be imported with our Python setup.
|
||||
installPhase = ''
|
||||
cmake . -DBUILD_EXAMPLES=OFF -DBUILD_PYTHON=OFF -DBUILD_SAMPLES=OFF
|
||||
cmake --install .
|
||||
pip install --prefix="$python" python/
|
||||
'';
|
||||
|
||||
outputs = [ "out" "python" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -912,7 +912,8 @@ with self;
|
|||
|
||||
sexplib0 = janePackage {
|
||||
pname = "sexplib0";
|
||||
hash = "0jag0bz2173b0n7hx013fhghydhh92arqjlrcnf5x025bw8nz66v";
|
||||
version = "0.15.1";
|
||||
hash = "sha256-6K0yrCbVFcUalN4cQuDI1TvWvNDjfXXRDhJKUskbqRY=";
|
||||
minimumOCamlVersion = "4.04.2";
|
||||
meta.description = "Library containing the definition of S-expressions and some base converters";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,27 +1,23 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, pkg-config, buildDunePackage, dune-configurator, gtk3, cairo2 }:
|
||||
{ lib, fetchFromGitHub, pkg-config, buildDunePackage, dune-configurator
|
||||
, gtk3, cairo2
|
||||
, camlp-streams
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
pname = "lablgtk3";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "garrigue";
|
||||
repo = "lablgtk";
|
||||
rev = version;
|
||||
sha256 = "sha256:0b17w9qb1f02h3313cm62mrqlhwxficppzm72n7sf8mmwrylxbm7";
|
||||
sha256 = "sha256-1kXJP+tKudP3qfosTgZAQueNK46H9aLevEj6wxPKDWY=";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
name = "dune-project.patch";
|
||||
url = "https://raw.githubusercontent.com/ocaml/opam-repository/10a48cb9fab88f67f6cb70280e0fec035c32d41c/packages/lablgtk3/lablgtk3.3.1.2/files/dune-project.patch";
|
||||
sha256 = "03jf5hclqdq7iq84djaqcnfnnnd7z3hb48rr8n1gyxzjyx86b3fh";
|
||||
}) ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dune-configurator ];
|
||||
buildInputs = [ dune-configurator camlp-streams ];
|
||||
propagatedBuildInputs = [ gtk3 cairo2 ];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ buildDunePackage {
|
|||
pname = "lablgtk3-gtkspell3";
|
||||
buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs;
|
||||
propagatedBuildInputs = [ lablgtk3 ];
|
||||
inherit (lablgtk3) src version useDune2 meta nativeBuildInputs;
|
||||
inherit (lablgtk3) src version meta nativeBuildInputs;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ buildDunePackage {
|
|||
pname = "lablgtk3-sourceview3";
|
||||
buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ];
|
||||
propagatedBuildInputs = [ lablgtk3 ];
|
||||
inherit (lablgtk3) src version useDune2 meta nativeBuildInputs;
|
||||
inherit (lablgtk3) src version meta nativeBuildInputs;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "2.2.14";
|
||||
version = "2.2.16";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0O8fax25vabItFnUD9N7C4gyMSKPHqHSgzJXJjp5dGw=";
|
||||
hash = "sha256-Dr7K71wEk46UPyNp3FRuRVqfOn40X059lf3yojM57cc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-oauth-toolkit";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-c78QYlU/gB4Lt04TlQFjtsS6pyjDm/fURBMa9hXLpLI=";
|
||||
sha256 = "sha256-mynchdvrfBGKMeFFb2oDaANhtSCxq85Nibx7GfSY2nQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,13 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-rest-polymorphic";
|
||||
version = "0.1.9";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apirobot";
|
||||
repo = "django-rest-polymorphic";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-p3ew2NONSyiGzDzxGTy/cx3fcQhhvnzqopJzgqhXadY=";
|
||||
# https://github.com/denisorehovsky/django-rest-polymorphic/issues/42
|
||||
rev = "9d920eb91ef13144094426f9ebc0ca80247c0fe3";
|
||||
sha256 = "sha256-k7Cl2QYkaGOZaTo8v5Wg9Wqh8x0WC5i9Sggqj8eeECY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-spectacular-sidecar";
|
||||
version = "2022.6.1";
|
||||
version = "2022.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfranzel";
|
||||
repo = "drf-spectacular-sidecar";
|
||||
rev = version;
|
||||
sha256 = "sha256-SKMAA8tcvWUF7EARq9vN8C0DWcQFRX5j/tfgHF5TUWs=";
|
||||
sha256 = "sha256-ztUdV+Bhi3zx5UiwnpiQM/RglUH1n9J48Beuq2GPWdg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-spectacular";
|
||||
version = "0.22.1";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tfranzel";
|
||||
repo = "drf-spectacular";
|
||||
rev = version;
|
||||
sha256 = "sha256-SgzyIzgFBXsNHfY2OfCq0LhJyi/ZCOSA8QveKNduIBc=";
|
||||
sha256 = "sha256-WE+iOD3OjDByisHI9GgvjUUSpvOz+IYi/3Y8AmR7Eps=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -66,6 +66,11 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# requires django with gdal
|
||||
"test_rest_framework_gis"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "drf_spectacular" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-core";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4WwVoReJvFo0V6+ygYo1QKA/NB5ucQ1/m79s3i70p8g=";
|
||||
sha256 = "sha256-EMBvdzn+V3gfh1Izdejho6RnS/Y5LNYTGjIiGCuXEyA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-kms";
|
||||
version = "2.12.1";
|
||||
version = "2.12.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-A1sIdkNdK4L6gb3VBApuKJ71J5N2Jq43kcD8DpHU99E=";
|
||||
sha256 = "sha256-ooWxYH4B8HY9ybWj0GQqUnfiFXzLCqyXGGZsocV9Od0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hg-git";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ORGDOWLrnImca+qPtJZmyC8hGxJNCEC+tq2V4jpGIbY=";
|
||||
hash = "sha256-P3Ng9bD16AX7DJac/Y168GSWLTIAD3I1aLblYIDQiyk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "json-schema-for-humans";
|
||||
version = "0.41.8";
|
||||
version = "0.42.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "coveooss";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lz08+T8ITsCI0qjcd/JcgXG4o87UjoP1NQa01FJ7fO0=";
|
||||
hash = "sha256-WVLIx85ivHz5b6C1AfgMAApngeFCuWwWhaBWNcfOvXA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openstackdocstheme";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-csbU+am2OXp4xJ60P4Cp2i7TCz+PnRg3BCcc9+PyPM8=";
|
||||
sha256 = "sha256-yB1CdOqWV7hEfUYdtqQ/fd4sNfy7Sp7YJbRQhK5egLk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, eventlet
|
||||
, oslo-config
|
||||
, oslo-context
|
||||
, oslo-serialization
|
||||
|
|
@ -16,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-log";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "oslo.log";
|
||||
inherit version;
|
||||
hash = "sha256-c6tyNKii1QvfUmyHTfocsrEIO6+a2VvC64r1YkidTQE=";
|
||||
hash = "sha256-+2Xy+dJEI/pt1urY7NIfZlxi4P2fkL8xHkwVO1+Kt+o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -39,6 +40,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
eventlet
|
||||
oslotest
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,29 +1,49 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pyparsing
|
||||
, amply
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pyparsing
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "PuLP";
|
||||
version = "2.6.0";
|
||||
pname = "pulp";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4b4f7e1e954453e1b233720be23aea2f10ff068a835ac10c090a93d8e2eb2e8d";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-j0f6OiscJyTqPNyLp0qWRjCGLWuT3HdU1S/sxpnsiMo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyparsing amply ];
|
||||
propagatedBuildInputs = [
|
||||
amply
|
||||
pyparsing
|
||||
];
|
||||
|
||||
# only one test that requires an extra
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pulp" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pulp"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# The solver is not available
|
||||
"PULP_CBC_CMDTest"
|
||||
"test_examples"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to generate generate MPS or LP files";
|
||||
homepage = "https://github.com/coin-or/pulp";
|
||||
description = "PuLP is an LP modeler written in python";
|
||||
maintainers = with maintainers; [ teto ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ teto ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, autopep8
|
||||
, buildPythonPackage
|
||||
, docstring-to-markdown
|
||||
, fetchFromGitHub
|
||||
, flake8
|
||||
, flaky
|
||||
|
|
@ -30,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lsp-server";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -39,30 +40,32 @@ buildPythonPackage rec {
|
|||
owner = "python-lsp";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-tW2w94HI6iy8vcDb5pIL79bAO6BJp9q6SMAXgiVobm0=";
|
||||
sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
|
||||
--replace "--cov pylsp --cov test" "" \
|
||||
--replace "autopep8>=1.6.0,<1.7.0" "autopep8" \
|
||||
--replace "flake8>=4.0.0,<4.1.0" "flake8" \
|
||||
--replace "mccabe>=0.6.0,<0.7.0" "mccabe" \
|
||||
--replace "pycodestyle>=2.8.0,<2.9.0" "pycodestyle" \
|
||||
--replace "pyflakes>=2.4.0,<2.5.0" "pyflakes"
|
||||
--replace "flake8>=5.0.0,<5.1.0" "flake8" \
|
||||
--replace "mccabe>=0.7.0,<0.8.0" "mccabe" \
|
||||
--replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \
|
||||
--replace "pyflakes>=2.5.0,<2.6.0" "pyflakes"
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION=${version}
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
docstring-to-markdown
|
||||
jedi
|
||||
pluggy
|
||||
python-lsp-jsonrpc
|
||||
setuptools
|
||||
setuptools-scm
|
||||
ujson
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-typed-ast";
|
||||
version = "1.5.8";
|
||||
version = "1.5.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FW+6ypA+hXH+cLsLVi/7qSp8vbe6yacTNRyifYgYO6c=";
|
||||
hash = "sha256-9kwV7ATAkRgZrEwP0AUnlRMgAfv16iPR1+T+rX3km/w=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "doctl";
|
||||
version = "1.84.1";
|
||||
version = "1.85.0";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
owner = "digitalocean";
|
||||
repo = "doctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F1vavqdBeKVWKWQTrgqT6NIGduAcFc42rl0rG8SEdLs=";
|
||||
sha256 = "sha256-zA+9RpGGiRlu/xQoKjkI5zg6d2fPR7WKW0Sj2ggSypA=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "karate";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar";
|
||||
sha256 = "69b9ba1cd9563cbad802471e7250dd46828df7ad176706577389dfe6e604e5ec";
|
||||
sha256 = "sha256-uQHE8Mf70t7gtALdxO1tltUkwEKx0emWWliZEzwGW+Q=";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ azahi nitsky ];
|
||||
platforms = platforms.unix;
|
||||
# https://github.com/NixOS/nixpkgs/pull/189712#issuecomment-1237791234
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ClassiCube";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UnknownShadow200";
|
||||
repo = "ClassiCube";
|
||||
rev = version;
|
||||
sha256 = "a31e95a7f49e58aaf4271015dd60730fc74d9776dfac425a8f14eb64cdcd9944";
|
||||
sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dos2unix makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
|
||||
in package.override rec {
|
||||
pname = "snipe-it";
|
||||
version = "6.0.12";
|
||||
version = "6.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snipe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1/v2kCXedhtiqyO6d7kpmAnWGidXM1djlpbBr7/AyQI=";
|
||||
sha256 = "sha256-QwPl3JXB8gZS1/VyPBCc3PIQa+qtUNpuANSx4+oxWYg=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.44.3";
|
||||
version = "3.46.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-x64.tar.gz";
|
||||
sha256 = "0mykgk7gkb0369i3a52jjcnwm87a8c8vfr92k9mca6hr6z79d9kp";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-linux-x64.tar.gz";
|
||||
sha256 = "1q80kp680ilvj9w51m90v6lzj11p3xvzvihf2g5c9lr5r0f4zkaz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz";
|
||||
sha256 = "0g3s60yscxrwzbq40zii0mnh2z9yggz0wc2kg9yrfzybrmsmx8z3";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-linux-amd64.tar.gz";
|
||||
sha256 = "1fak0izpaq13jsnab7y1c0vk95lja6w767gk0rp3mp76h6r0mxc8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-amd64.tar.gz";
|
||||
sha256 = "0yprg3mgb7zik6s2hhh1jj7kyic9ihipr698vspgdjxa3ya4nvij";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-amd64.tar.gz";
|
||||
|
|
@ -163,16 +163,16 @@
|
|||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-x64.tar.gz";
|
||||
sha256 = "0jjz3xwlqw62g8vzmc3pjpad9h6i81vfskxlwr88n1sgwsr6z6ml";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-darwin-x64.tar.gz";
|
||||
sha256 = "076bf9pj5k9n0gvyvms59x13dwdf9s0sqfmjrv3f3pq52676bycr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0f62xfma1d299625ydj3f95anz47l41dyasq9vpvsi1cqii6h4a1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0zkg8iqd9n8hfaai0l5vcl6vgi1mh3ggs9bsszrcl7kyzkf3zyyy";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-amd64.tar.gz";
|
||||
sha256 = "08d4d4rnqdx2c18ji6lm5bflskxfh7r918hickpyg3bvswgmg7kg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-amd64.tar.gz";
|
||||
|
|
@ -321,16 +321,16 @@
|
|||
];
|
||||
aarch64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-arm64.tar.gz";
|
||||
sha256 = "1nqsvpms3l5vbcjcn8yhwia4li1v9hgnbc2mmb1ywmv2za7nbq2h";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-linux-arm64.tar.gz";
|
||||
sha256 = "137ngy26ag04yw1k3hzhmadqphw7ipfz1dcg2aal0vq8rk0xrfnb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz";
|
||||
sha256 = "10gmwqfhvz1yp0ld69w01fmjnfw907pa0pmzjndm3p9fwqjrr2nd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-linux-arm64.tar.gz";
|
||||
sha256 = "1qf8v5qysxxlamz36z1pnjy5mqjn8dbf6aps52rbhyk2mi6v3k7c";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-arm64.tar.gz";
|
||||
sha256 = "014rlaw7acyz2rsmnv2mq9as6z9c9aa4s03qbfkk95sqyf6xvlqc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-arm64.tar.gz";
|
||||
|
|
@ -479,16 +479,16 @@
|
|||
];
|
||||
aarch64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-arm64.tar.gz";
|
||||
sha256 = "1nwgf0mg82vlc93adplw9c3x3fa3277ql8zbc8jqxbvm4l1hr4h2";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.46.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1id3l0dycqf8rwxzf2nx11xg2qcvzgpp3373l4qfab68251cw15d";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1v6dwsjbqmg9qnlhf5jl98r5c171xnsp3fnyfkg2h8874scg2gpp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0a9lzmkc3c7pc6axbymnq7s9b9qwmrjndg6hspx705d1fx4vs28g";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-arm64.tar.gz";
|
||||
sha256 = "19l5b3grxf0ckxpmjn7x8158bkzv8329adj7m4gi09d9sx6wwsxw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-arm64.tar.gz";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
|||
|
||||
# Version of Pulumi from
|
||||
# https://www.pulumi.com/docs/get-started/install/versions/
|
||||
VERSION="3.44.3"
|
||||
VERSION="3.46.0"
|
||||
|
||||
# An array of plugin names. The respective repository inside Pulumi's
|
||||
# Github organization is called pulumi-$name by convention.
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vgmtools";
|
||||
version = "unstable-2022-08-03";
|
||||
version = "unstable-2022-10-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vgmrips";
|
||||
repo = "vgmtools";
|
||||
rev = "a33c7b9d7c7608a3cfebbee4467c6909b42077d6";
|
||||
sha256 = "oVasSToGp2APfaD/xCt/3SwvGq7JtpP8VVDRPznYDH4=";
|
||||
rev = "9d7a9f4b1c40d26949fa730987f6c3eb9cf3e3ec";
|
||||
sha256 = "Joxlu+k8xaF90u+ydHhu6NpqGQAKL8r5u4qAsfVfOz8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
, coreutils
|
||||
, getconf
|
||||
, less
|
||||
# tests
|
||||
, bash
|
||||
, zsh
|
||||
, fish
|
||||
# batgrep
|
||||
, ripgrep
|
||||
# prettybat
|
||||
|
|
@ -51,7 +55,7 @@ let
|
|||
|
||||
# Run the library tests as they don't have external dependencies
|
||||
doCheck = true;
|
||||
checkInputs = lib.optionals stdenv.isDarwin [ getconf ];
|
||||
checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]);
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# test list repeats suites. Unique them
|
||||
|
|
@ -59,12 +63,12 @@ let
|
|||
while read -r action arg _; do
|
||||
[[ "$action" == "test_suite" && "$arg" == lib_* ]] &&
|
||||
test_suites+=(["$arg"]=1)
|
||||
done <<<"$(bash ./test.sh --compiled --list --porcelain)"
|
||||
done <<<"$(./test.sh --compiled --list --porcelain)"
|
||||
(( ''${#test_suites[@]} != 0 )) || {
|
||||
echo "Couldn't find any library test suites"
|
||||
exit 1
|
||||
}
|
||||
bash ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
|
||||
./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
|
|
@ -108,7 +112,7 @@ let
|
|||
dontBuild = true; # we've already built
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = lib.optionals stdenv.isDarwin [ getconf ];
|
||||
checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]);
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
bash ./test.sh --compiled --suite ${name}
|
||||
|
|
@ -139,6 +143,7 @@ in
|
|||
batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta delta);
|
||||
batgrep = script "batgrep" [ less coreutils ripgrep ];
|
||||
batman = script "batman" [ util-linux ];
|
||||
batpipe = script "batpipe" [ less ];
|
||||
batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr);
|
||||
prettybat = script "prettybat" ([]
|
||||
++ optionalDep withShFmt shfmt
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "1.2022.7";
|
||||
version = "1.2022.12";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plantuml-server";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
|
||||
sha256 = "sha256-QX4eZStNXBHy44hKV1GnTDpumq65OsGYR0VmXyF7DVg=";
|
||||
sha256 = "sha256-H05/1Em9aTRLhI5vo119JLnuKJlK6/ZLu0v/wU0fPLQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanata";
|
||||
version = "1.0.7";
|
||||
version = "1.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2gGFAz0zXea+27T4ayDj6KdoI0ThwXV7U0CspHduTiQ=";
|
||||
sha256 = "sha256-9x0ELoYCwfE0N7CuxZYMPBmX8A5Vh4pAtbcY6X6S9eQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-0NvZATdPABIboL5xvmBmDbqPPWvO4mM6wVB3FrOVHIQ=";
|
||||
cargoHash = "sha256-e7yftR1mLMllBe0OIU5QWmGtQm+h30CbTInB6ojQk7M=";
|
||||
|
||||
buildFeatures = lib.optional withCmd "cmd";
|
||||
|
||||
|
|
|
|||
|
|
@ -43,11 +43,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sile";
|
||||
version = "0.14.3";
|
||||
version = "0.14.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1n7nlrvhdp6ilpx6agb5w6flss5vbflbldv0495h19fy5fxkb5vz";
|
||||
sha256 = "091sy3k29q15ksqr650qmf9lz8j9lqbabfph4cf63plg4dnf9m98";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1393,6 +1393,7 @@ mapAliases ({
|
|||
# spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
|
||||
spidermonkey = spidermonkey_78; # Added 2020-10-09
|
||||
split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13
|
||||
spotify-unwrapped = spotify; # added 2022-11-06
|
||||
spring-boot = spring-boot-cli; # added 2020-04-24
|
||||
sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22
|
||||
sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22
|
||||
|
|
|
|||
|
|
@ -1357,7 +1357,7 @@ with pkgs;
|
|||
|
||||
kanata = callPackage ../tools/system/kanata { };
|
||||
|
||||
kanata-with-cmd = callPackage ../tools/system/kanata { withCmd = true; };
|
||||
kanata-with-cmd = kanata.override { withCmd = true; };
|
||||
|
||||
ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { };
|
||||
|
||||
|
|
@ -17302,7 +17302,10 @@ with pkgs;
|
|||
modd = callPackage ../development/tools/modd { };
|
||||
|
||||
mold = callPackage ../development/tools/mold {
|
||||
inherit (llvmPackages) stdenv;
|
||||
# C++20 is required, aarch64-linux has gcc 9 by default
|
||||
stdenv = if stdenv.isLinux && stdenv.isAarch64
|
||||
then llvmPackages_12.libcxxStdenv
|
||||
else llvmPackages.stdenv;
|
||||
};
|
||||
|
||||
msgpack-tools = callPackage ../development/tools/msgpack-tools { };
|
||||
|
|
@ -31939,9 +31942,7 @@ with pkgs;
|
|||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
spotify-unwrapped = callPackage ../applications/audio/spotify { };
|
||||
|
||||
spotify = callPackage ../applications/audio/spotify/wrapper.nix { };
|
||||
spotify = callPackage ../applications/audio/spotify { };
|
||||
|
||||
spotifywm = callPackage ../applications/audio/spotifywm { };
|
||||
|
||||
|
|
@ -35456,11 +35457,11 @@ with pkgs;
|
|||
|
||||
or-tools = callPackage ../development/libraries/science/math/or-tools {
|
||||
python = python3;
|
||||
# or-tools builds with -std=c++17, so abseil-cpp must
|
||||
# or-tools builds with -std=c++20, so abseil-cpp must
|
||||
# also be built that way
|
||||
abseil-cpp = abseil-cpp.override {
|
||||
abseil-cpp = abseil-cpp_202111.override {
|
||||
static = true;
|
||||
cxxStandard = "17";
|
||||
cxxStandard = "20";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue