Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
b826485d29
48 changed files with 232 additions and 188 deletions
|
|
@ -449,7 +449,7 @@ let
|
|||
${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
|
||||
${optionalString (config.root != null) "root ${config.root};"}
|
||||
${optionalString (config.alias != null) "alias ${config.alias};"}
|
||||
${optionalString (config.return != null) "return ${config.return};"}
|
||||
${optionalString (config.return != null) "return ${toString config.return};"}
|
||||
${config.extraConfig}
|
||||
${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"}
|
||||
${mkBasicAuth "sublocation" config}
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ with lib;
|
|||
};
|
||||
|
||||
return = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
type = with types; nullOr (oneOf [ str int ]);
|
||||
default = null;
|
||||
example = "301 http://example.com$request_uri";
|
||||
description = lib.mdDoc ''
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@ assert lib.asserts.assertMsg (usePipewire != usePulseaudio) "You need to enable
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jamesdsp";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Audio4Linux";
|
||||
repo = "JDSP4Linux";
|
||||
fetchSubmodules = true;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XYJl94/PstWG5qaBQ2rXc/nG9bDeP3Q62zDYHmZvPaw=";
|
||||
hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify
|
||||
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome
|
||||
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
|
||||
, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu
|
||||
, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL
|
||||
# High-DPI support: Spotify's --force-device-scale-factor argument
|
||||
# not added if `null`, otherwise, should be a number.
|
||||
, deviceScaleFactor ? null
|
||||
|
|
@ -44,6 +44,7 @@ let
|
|||
libdbusmenu
|
||||
libdrm
|
||||
libgcrypt
|
||||
libGL
|
||||
libnotify
|
||||
libpng
|
||||
libpulseaudio
|
||||
|
|
|
|||
|
|
@ -477,6 +477,13 @@ let
|
|||
|
||||
ox-rss = buildWithGit super.ox-rss;
|
||||
|
||||
python-isort = super.python-isort.overrideAttrs (attrs: {
|
||||
postPatch = attrs.postPatch or "" + ''
|
||||
substituteInPlace python-isort.el \
|
||||
--replace '-isort-command "isort"' '-isort-command "${lib.getExe pkgs.isort}"'
|
||||
'';
|
||||
});
|
||||
|
||||
# upstream issue: missing file header
|
||||
mhc = super.mhc.override {
|
||||
inherit (self.melpaPackages) calfw;
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0153vsb62r3g3cck70n05wkxxkh9w53zhnra7hzfy4m19v8xinzm";
|
||||
x86_64-darwin = "1xqf0s05ns1yqd6qz4633c5xgb0l0nm2n1kfvxv7wqhgf94x80fm";
|
||||
aarch64-linux = "1hfg01w9k60lf30chvj7mrjb1m3p5czv42cf7zj97j5pkhpg2lmi";
|
||||
aarch64-darwin = "0vzayy1akh9hzs32cyxvvfnsbg9601jrs7bsvql3728dy9wkc8w2";
|
||||
armv7l-linux = "0cc9b47dziqizcs37yci48ymyg176lwsyh7w7b9imh1s658vgikv";
|
||||
x86_64-linux = "16m7a2j9rmnp9pqpyyy2dx09paj1qh0h4gb1dhhwakw7w0zjlxn5";
|
||||
x86_64-darwin = "1h4kwqddkm19pnh08b33jd10d0n5kcyqkm7kn8fnyj0bpkrzwyql";
|
||||
aarch64-linux = "0mpqrxvrp8cgv40ck5sprdzzafkb69skisygaq7lr2rfky2gn019";
|
||||
aarch64-darwin = "1bakb5789zkpzymq3zvs6ls36c4xp50j5xiwyz1wgxgf4wnh06zw";
|
||||
armv7l-linux = "0rnp2lfx8xjz7xlmc7sxpg5xd5w72cnp76gv441csbyw3bscbxpw";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
|
|
@ -29,7 +29,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.84.2.23319";
|
||||
version = "1.85.0.23343";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -36,6 +36,11 @@
|
|||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
mlt-full = mlt.override {
|
||||
ffmpeg = ffmpeg-full;
|
||||
};
|
||||
in
|
||||
mkDerivation {
|
||||
pname = "kdenlive";
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -60,7 +65,7 @@ mkDerivation {
|
|||
kplotting
|
||||
ktextwidgets
|
||||
mediainfo
|
||||
mlt
|
||||
mlt-full
|
||||
phonon-backend-gstreamer
|
||||
qtdeclarative
|
||||
qtmultimedia
|
||||
|
|
@ -81,8 +86,9 @@ mkDerivation {
|
|||
# https://github.com/NixOS/nixpkgs/issues/83885
|
||||
patches = [ ./dependency-paths.patch ];
|
||||
|
||||
inherit mlt mediainfo;
|
||||
inherit mediainfo;
|
||||
ffmpeg = ffmpeg-full;
|
||||
mlt = mlt-full;
|
||||
|
||||
postPatch =
|
||||
# Module Qt5::Concurrent must be included in `find_package` before it is used.
|
||||
|
|
|
|||
|
|
@ -57,13 +57,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bambu-studio";
|
||||
version = "01.08.00.62";
|
||||
version = "01.08.01.57";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bambulab";
|
||||
repo = "BambuStudio";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Rb8YNf+ZQ8+9jAP/ZLze0PfY/liE7Rr2bJX33AENsbg=";
|
||||
hash = "sha256-15Eq+ylQK+xlxG7cg6xoCPb+zJ66qqwQIKd1zA13I5o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nerd-font-patcher";
|
||||
version = "3.0.2";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/FontPatcher.zip";
|
||||
sha256 = "sha256-ZJpF/Q5lfcW3srb2NbJk+/QEuwaFjdzboa+rl9L7GGE=";
|
||||
sha256 = "sha256-H2dPUs6HVKJcjxy5xtz9nL3SSPXKQF3w30/0l7A0PeY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -83,4 +83,15 @@ rec {
|
|||
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
|
||||
'';
|
||||
};
|
||||
|
||||
nomad_1_7 = generic {
|
||||
buildGoModule = buildGo121Module;
|
||||
version = "1.7.1";
|
||||
sha256 = "sha256-dlKlpgQRug/72UmIogOkKNGBT3sPjgGVVuvzHZ4vh3c=";
|
||||
vendorHash = "sha256-MZmhFdZZBkKZDgON1ewVm9Z9jZ1EULp/yMT9q6fCqIw=";
|
||||
passthru.tests.nomad = nixosTests.nomad;
|
||||
preCheck = ''
|
||||
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,22 +9,25 @@ let
|
|||
taler-wallet-core = fetchgit {
|
||||
url = "https://git.taler.net/wallet-core.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uwbgIzSjLN+KQCY134VfnCuBEtvCO3a6mEw++HoZDHs=";
|
||||
sha256 = "sha256-oL8vi8gxPjKxRpioMs0GLvkzlTkrm1kyvhsXOgrtvVQ=";
|
||||
};
|
||||
in rec {
|
||||
taler-exchange = stdenv.mkDerivation rec {
|
||||
|
||||
taler-exchange = stdenv.mkDerivation {
|
||||
pname = "taler-exchange";
|
||||
inherit version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.taler.net/exchange.git";
|
||||
rev = "v${version}";
|
||||
# REMOVEME: this should only be a problem for specifically v0.9.3
|
||||
# When fetching submodules without deep clone we get the following error:
|
||||
# "Server does not allow request for unadvertised object"
|
||||
deepClone = true;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-txWwW5vqTblNgVIXdDkpNNZOXpY0udMaz4Wog1GobzE=";
|
||||
sha256 = "sha256-NgDZF6LNeJI4ZuXEwoRdFG6g0S9xNTVhszzlfAnzVOs=";
|
||||
|
||||
# When fetching submodules without the .git folder we get the following error:
|
||||
# "Server does not allow request for unadvertised object"
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -76,7 +79,7 @@ in rec {
|
|||
};
|
||||
};
|
||||
|
||||
taler-merchant = stdenv.mkDerivation rec {
|
||||
taler-merchant = stdenv.mkDerivation {
|
||||
pname = "taler-merchant";
|
||||
inherit version;
|
||||
|
||||
|
|
@ -133,4 +136,6 @@ in rec {
|
|||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
in {
|
||||
inherit taler-exchange taler-merchant;
|
||||
}
|
||||
|
|
|
|||
46
pkgs/by-name/id/idsk/package.nix
Normal file
46
pkgs/by-name/id/idsk/package.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "idsk";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpcsdk";
|
||||
repo = "idsk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rYClWq1Nl3COoG+eOJyFDTvBSzpHpGminU4bndZs6xc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cpcsdk/idsk/commit/52fa3cdcc10d4ba6c75cab10ca7067b129198d92.patch";
|
||||
hash = "sha256-Ll0apllNj+fP7kZ1n+bBowrlskLK1bIashxxgPVVxmg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 iDSK $out/bin/iDSK
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manipulating CPC dsk images and files";
|
||||
homepage = "https://github.com/cpcsdk/idsk";
|
||||
license = licenses.mit;
|
||||
mainProgram = "iDSK";
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-wenkai";
|
||||
version = "1.311";
|
||||
version = "1.312";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz";
|
||||
hash = "sha256-R7j6SBWGbkS4cJI1J8M5NDIDeJDFMjtXZnGiyxm2rjg=";
|
||||
hash = "sha256-KU0cTzdHfWIqYbBksGym9JaN/M3VRASYcQOxrAxip4I=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "papirus-icon-theme";
|
||||
version = "20231101";
|
||||
version = "20231201";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-0ooHuMqGzlMLVTR/u+kCJLibfqTAtq662EG8i3JIzPA=";
|
||||
hash = "sha256-nLc2nt8YI193loMHjzzEwgvb+tdNrVTZskqssX2oFrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@ stdenv.mkDerivation rec {
|
|||
# fixes cmake support
|
||||
sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
|
||||
|
||||
# disables cache in user home, use installation directory instead
|
||||
sed -i '/^def/!s/root_is_writable()/True/' tools/config.py
|
||||
sed -i "/^def check_sanity/a\\ return" tools/shared.py
|
||||
|
||||
echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ callPackage, fetchFromGitHub, gambit-support }:
|
||||
|
||||
callPackage ./build.nix rec {
|
||||
version = "unstable-2023-10-07";
|
||||
git-version = "4.9.5-59-g342399c7";
|
||||
stampYmd = 20231007;
|
||||
stampHms = 170745;
|
||||
rev = "342399c736ec560c0ff4faeaeb9599b45633f26c";
|
||||
version = "unstable-2023-12-04";
|
||||
git-version = "4.9.5-84-g6b19d0c9";
|
||||
stampYmd = 20231204;
|
||||
stampHms = 204859;
|
||||
rev = "6b19d0c9084341306bbb7d6895321090a82988a0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gambit";
|
||||
repo = "gambit";
|
||||
inherit rev;
|
||||
sha256 = "121pj6lxihjjnfq33lq4m5hi461xbs9f41qd4l46556dr15cyf8f";
|
||||
sha256 = "0njcz9krak8nfyk3x6bc6m1rixzsjc1fyzhbz2g3aq5v8kz9mkl5";
|
||||
};
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,17 +24,16 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = buildInputs_libraries;
|
||||
|
||||
postPatch = ''
|
||||
echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ;
|
||||
patchShebangs . ;
|
||||
grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do
|
||||
substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ;
|
||||
done ;
|
||||
substituteInPlace ./configure --replace 'set -e' 'set -e ; git () { echo "v${git-version}" ;}' ;
|
||||
substituteInPlace ./src/build/build-version.scm --replace "with-exception-catcher" '(lambda _ "v${git-version}")' ;
|
||||
#rmdir src/gambit
|
||||
#cp -a ${pkgs.gambit-unstable.src} ./src/gambit
|
||||
chmod -R u+w ./src/gambit
|
||||
( cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms} )
|
||||
cat > MANIFEST <<EOF
|
||||
gerbil_stamp_version=v${git-version}
|
||||
gambit_stamp_version=v${gambit-git-version}
|
||||
gambit_stamp_ymd=${gambit-stampYmd}
|
||||
gambit_stamp_hms=${gambit-stampHms}
|
||||
EOF
|
||||
for f in src/bootstrap/gerbil/compiler/driver__0.scm \
|
||||
src/build/build-libgerbil.ss \
|
||||
src/gerbil/compiler/driver.ss ; do
|
||||
|
|
@ -58,8 +57,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-zlib"
|
||||
"--enable-sqlite"
|
||||
"--enable-shared"
|
||||
"--disable-deprecated"
|
||||
"--enable-march=" # Avoid non-portable invalid instructions
|
||||
"--enable-march=" # Avoid non-portable invalid instructions. Use =native if local build only.
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
|
@ -70,15 +68,7 @@ stdenv.mkDerivation rec {
|
|||
LD=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}ld \
|
||||
XMKMF=${coreutils}/bin/false
|
||||
unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
|
||||
(cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms})
|
||||
./configure ${builtins.concatStringsSep " " configureFlags}
|
||||
(cd src/gambit ;
|
||||
substituteInPlace config.status \
|
||||
${lib.optionalString (gccStdenv.isDarwin && !gambit-params.stable)
|
||||
''--replace "/usr/local/opt/openssl@1.1" "${lib.getLib openssl}"''} \
|
||||
--replace "/usr/local/opt/openssl" "${lib.getLib openssl}"
|
||||
./config.status
|
||||
)
|
||||
'';
|
||||
|
||||
extraLdOptions = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }:
|
||||
|
||||
callPackage ./build.nix rec {
|
||||
version = "0.18";
|
||||
git-version = "0.18";
|
||||
version = "0.18.1";
|
||||
git-version = "0.18.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mighty-gerbils";
|
||||
repo = "gerbil";
|
||||
rev = "8ca36a928bc9345f9d28e5f2dfcb55ca558e85f9";
|
||||
sha256 = "sha256-EMiYgQM/Gl+dh6AxLYRZ0BKZ+VKFd+Lkyy9Pw11ivE8=";
|
||||
rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d";
|
||||
sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
inherit gambit-support;
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version
|
||||
gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd
|
||||
gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms
|
||||
gambit-git-version = "4.9.5-78-g8b18ab69";
|
||||
gambit-stampYmd = "20231029";
|
||||
gambit-stampHms = "163035";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
pname = "ftw";
|
||||
version = "unstable-2022-01-14";
|
||||
git-version = "8ba16b3";
|
||||
version = "unstable-2023-11-15";
|
||||
git-version = "e5e2f56";
|
||||
softwareName = "FTW: For The Web!";
|
||||
gerbil-package = "drewc/ftw";
|
||||
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
fun = fetchFromGitHub;
|
||||
owner = "drewc";
|
||||
repo = "ftw";
|
||||
rev = "8ba16b3c1cdc2150df5af8ef3c92040ef8b563b9";
|
||||
sha256 = "153i6whm5jfcj9s1qpxz03sq67969lq11brssyjc3yv3wyb1b07h";
|
||||
rev = "e5e2f56e90bf072ddf9c2987ddfac45f048e8a04";
|
||||
sha256 = "04164190vv1fzfk014mgqqmy5cml5amh63df31q2yc2kzvfajfc3";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
pname = "gerbil-crypto";
|
||||
version = "unstable-2023-09-27";
|
||||
git-version = "0.0-23-g341e09d";
|
||||
version = "unstable-2023-11-29";
|
||||
git-version = "0.1-1-g4197bfa";
|
||||
gerbil-package = "clan/crypto";
|
||||
gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ];
|
||||
nativeBuildInputs = [ pkgs.pkg-config ];
|
||||
|
|
@ -15,8 +15,8 @@
|
|||
fun = fetchFromGitHub;
|
||||
owner = "mighty-gerbils";
|
||||
repo = "gerbil-crypto";
|
||||
rev = "341e09dcb15c09c836eae18093c0f63f71c0a72f";
|
||||
sha256 = "1rq50q4p4vhr5drjvirmdkxaa4wszj1rxnhjaqz98bfpjm90yk4j";
|
||||
rev = "4197bfa71dc55657f79efd5cc21fe59839e840f2";
|
||||
sha256 = "1jdfz5x24dfvpwyfxalkhv83gf9ylyaqii1kg8rjl8dzickawrix";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
rec {
|
||||
pname = "gerbil-ethereum";
|
||||
version = "unstable-2023-10-06";
|
||||
git-version = "0.1-1-g08b08fc";
|
||||
version = "unstable-2023-12-04";
|
||||
git-version = "0.2-11-g124ec58";
|
||||
softwareName = "Gerbil-ethereum";
|
||||
gerbil-package = "clan/ethereum";
|
||||
version-path = "version";
|
||||
|
|
@ -15,8 +15,8 @@ rec {
|
|||
fun = fetchFromGitHub;
|
||||
owner = "mighty-gerbils";
|
||||
repo = "gerbil-ethereum";
|
||||
rev = "08b08fce8c83cb59bfb532eebb1c7a2dd4bd57ab";
|
||||
sha256 = "1sy7l869d2xqhq2qflsmkvr343jfhzsq43ixx75rqfpr3cdljz0b";
|
||||
rev = "124ec585157e2c505cd3c449a389c124ca6da9e9";
|
||||
sha256 = "0xg07k421r5p0qx98id66k0k2l3vi1is875857sd8q3h6bks0z54";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -34,7 +34,7 @@ rec {
|
|||
export GERBIL_PATH GERBIL_LOADPATH GLOW_SOURCE ORIG_GERBIL_PATH ORIG_GERBIL_LOADPATH
|
||||
exec ${gerbil}/bin/gxi "\$0" "\$@"
|
||||
|#
|
||||
(import :clan/ethereum/scripts/run-ethereum-test-net :clan/multicall)
|
||||
(import :clan/ethereum/scripts/run-ethereum-test-net :std/lib/multicall)
|
||||
(apply call-entry-point (cdr (command-line)))
|
||||
EOF
|
||||
chmod a+x $out/bin/run-ethereum-test-net
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, fetchFromGitHub, gerbilPackages, ... }:
|
||||
{
|
||||
pname = "gerbil-persist";
|
||||
version = "unstable-2023-10-07";
|
||||
git-version = "0.1.1-1-g3ce1d4a";
|
||||
version = "unstable-2023-11-29";
|
||||
git-version = "0.2-6-g8a5e40d";
|
||||
softwareName = "Gerbil-persist";
|
||||
gerbil-package = "clan/persist";
|
||||
version-path = "version";
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
fun = fetchFromGitHub;
|
||||
owner = "mighty-gerbils";
|
||||
repo = "gerbil-persist";
|
||||
rev = "3ce1d4a4b1d7be290e54f884d780c02ceee8f10e";
|
||||
sha256 = "1kzvgpqkpq4wlc0hlfxy314fbv6215aksrrlrrpq9w97wdibmv7x";
|
||||
rev = "8a5e40deb01140b9c8d03c6cc985e47a9d7123d8";
|
||||
sha256 = "1c1h1yp7gf23r3asxppgga4j4jmy4l9rlbb7vw9jcwvl8d30yrab";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
pname = "gerbil-poo";
|
||||
version = "unstable-2023-10-07";
|
||||
git-version = "0.1-1-g367ab43";
|
||||
version = "unstable-2023-11-29";
|
||||
git-version = "0.2-5-gacf654e";
|
||||
softwareName = "Gerbil-POO";
|
||||
gerbil-package = "clan/poo";
|
||||
version-path = "version";
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
fun = fetchFromGitHub;
|
||||
owner = "mighty-gerbils";
|
||||
repo = "gerbil-poo";
|
||||
rev = "367ab4376fdd6fc0b0892da2becef35a5039c583";
|
||||
sha256 = "0ci88zqi7gb55ahl0n7dk1ihij2j6dn8jb6rzfiilck773x46kdh";
|
||||
rev = "acf654eb040c548da260a7a5d52bafb057d23541";
|
||||
sha256 = "1pxv1j6hwcgjj67bb7vvlnyl3123r43ifldm6alm76v2mfp2vs81";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
pname = "gerbil-utils";
|
||||
version = "unstable-2023-10-08";
|
||||
git-version = "0.3-3-g2914428";
|
||||
version = "unstable-2023-12-06";
|
||||
git-version = "0.4-13-g9398865";
|
||||
softwareName = "Gerbil-utils";
|
||||
gerbil-package = "clan";
|
||||
version-path = "version";
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
fun = fetchFromGitHub;
|
||||
owner = "mighty-gerbils";
|
||||
repo = "gerbil-utils";
|
||||
rev = "29144289b40ce624adf30eab23b796ddd6b6b55d";
|
||||
sha256 = "0qysw2zs5acgri3wrjb3ngnnhd17xpr9hcdr4ya383k8k7jacr8a";
|
||||
rev = "939886579508ff34b58a0d65bbb7d666125d0551";
|
||||
sha256 = "0dga03qq7iy12bnpxr6d40qhvihsvn3y87psf2w2clnpypjb3blx";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
rec {
|
||||
pname = "glow-lang";
|
||||
version = "unstable-2023-10-06";
|
||||
git-version = "0.3.2-232-ga1a7a9e5";
|
||||
version = "unstable-2023-12-04";
|
||||
git-version = "0.3.2-237-g08d849ad";
|
||||
softwareName = "Glow";
|
||||
gerbil-package = "mukn/glow";
|
||||
version-path = "version";
|
||||
|
|
@ -17,8 +17,8 @@ rec {
|
|||
fun = fetchFromGitHub;
|
||||
owner = "Glow-Lang";
|
||||
repo = "glow";
|
||||
rev = "a1a7a9e51ba9a466d91c397d9da55af90076110c";
|
||||
sha256 = "0wgav4gbg6mlxgisjjbyhvhz94b29vv2rkjkjy1jl7v0hs3wbm52";
|
||||
rev = "08d849adef94ae9deead34e6981e77d47806c6e3";
|
||||
sha256 = "0dq0s8y3rgx0wa5wsgcdjs0zijnbgff3y4w2mkh5a04gz4lrhl50";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }:
|
||||
|
||||
callPackage ./build.nix rec {
|
||||
version = "unstable-2023-10-13";
|
||||
git-version = "0.18-2-g8ed012ff";
|
||||
version = "unstable-2023-12-06";
|
||||
git-version = "0.18.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mighty-gerbils";
|
||||
repo = "gerbil";
|
||||
rev = "8ed012ff9571fcfebcc07815813001a3f356150d";
|
||||
sha256 = "056kmjn7sd0hjwikmg7v3a1kvgsgvfi7pi9xcx3ixym9g3bqa4mx";
|
||||
rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d";
|
||||
sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
inherit gambit-support;
|
||||
gambit-params = gambit-support.unstable-params;
|
||||
gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version
|
||||
gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd
|
||||
gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms
|
||||
# These are available in pkgs.gambit-unstable.passthru.git-version, etc.
|
||||
gambit-git-version = "4.9.5-78-g8b18ab69";
|
||||
gambit-stampYmd = "20231029";
|
||||
gambit-stampHms = "163035";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -239,6 +239,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# fixed and renamed in 3.8.0RC1
|
||||
# https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29
|
||||
"test_visoss_6"
|
||||
# failing with PROJ 9.3.1
|
||||
# https://github.com/OSGeo/gdal/issues/8908
|
||||
"test_osr_esri_28"
|
||||
] ++ lib.optionals (!stdenv.isx86_64) [
|
||||
# likely precision-related expecting x87 behaviour
|
||||
"test_jp2openjpeg_22"
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "proj";
|
||||
version = "9.3.0";
|
||||
version = "9.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
hash = "sha256-M1KUXzht4qIjPfHxvzPr7XUnisMwtbegKp18XQjNYHg=";
|
||||
hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
|
||||
, setuptools
|
||||
, nodejs
|
||||
, yarn
|
||||
, prefetch-yarn-deps
|
||||
, fetchYarnDeps
|
||||
|
||||
, setuptools
|
||||
, flask
|
||||
, werkzeug
|
||||
, plotly
|
||||
|
|
@ -37,26 +37,27 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.14.1";
|
||||
format = "setuptools";
|
||||
version = "2.14.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vQOfX9RCIbr5lfUyT2knwrO374/vm7jH+/1+BeqmRjI=";
|
||||
repo = "dash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EFEsFgd3VbzlIUiz1fBIsKHywgWrL74taDFx0yIM/Ks=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
nodejs
|
||||
yarn
|
||||
prefetch-yarn-deps
|
||||
];
|
||||
|
||||
yarnDeps = fetchYarnDeps {
|
||||
yarnLock = src + "/@plotly/dash-jupyterlab/yarn.lock";
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock";
|
||||
hash = "sha256-mkiyrA0jGiP0zbabSjgHFLEUX3f+LZdJ8eARI5QA8CU=";
|
||||
};
|
||||
|
||||
|
|
@ -65,12 +66,12 @@ buildPythonPackage rec {
|
|||
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
yarn config --offline set yarn-offline-mirror ${yarnDeps}
|
||||
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
|
||||
fixup-yarn-lock yarn.lock
|
||||
|
||||
substituteInPlace package.json --replace jlpm yarn
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts
|
||||
patchShebangs .
|
||||
patchShebangs node_modules
|
||||
|
||||
# Generates the jupyterlab extension files
|
||||
yarn run build:pack
|
||||
|
|
@ -79,7 +80,6 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
setuptools # for importing pkg_resources
|
||||
flask
|
||||
werkzeug
|
||||
plotly
|
||||
|
|
@ -125,9 +125,9 @@ buildPythonPackage rec {
|
|||
pythonImportsCheck = [ "dash" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Python framework for building analytical web applications";
|
||||
homepage = "https://dash.plot.ly/";
|
||||
changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ antoinerg tomasajt ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportCheck = [
|
||||
pythonImportsCheck = [
|
||||
"gentools"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [ intervaltree ];
|
||||
pythonImportCheck = [ "ipymarkup" ];
|
||||
pythonImportsCheck = [ "ipymarkup" ];
|
||||
|
||||
# Upstream has no tests:
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ buildPythonPackage {
|
|||
tqdm
|
||||
];
|
||||
|
||||
pythonImportCheck = [
|
||||
pythonImportsCheck = [
|
||||
"mediafire_dl"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
pytestFlagsArray = [ "tests/" ];
|
||||
pythonImportCheck = [ "natasha" ];
|
||||
pythonImportsCheck = [ "natasha" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "NLP framework for Russian language";
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
nativeCheckInputs = [ pytestCheckHook gensim ];
|
||||
# TODO: remove when gensim usage will be fixed in `navec`.
|
||||
disabledTests = [ "test_gensim" ];
|
||||
pythonImportCheck = [ "navec" ];
|
||||
pythonImportsCheck = [ "navec" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Compact high quality word embeddings for Russian language";
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ buildPythonPackage rec {
|
|||
"lark"
|
||||
];
|
||||
|
||||
pythonImportChecks = [ "ndn" ];
|
||||
pythonImportsCheck = [ "ndn" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An NDN client library with AsyncIO support";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
pytestFlagsArray = [ "razdel" ];
|
||||
pythonImportCheck = [ "razdel" ];
|
||||
pythonImportsCheck = [ "razdel" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rule-based system for Russian sentence and word tokenization";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
|
|
@ -13,11 +13,9 @@ buildPythonPackage rec {
|
|||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hsoft";
|
||||
repo = "sgmllib";
|
||||
rev = "799964676f35349ca2dd04503e34c2b3ad522c0d";
|
||||
sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eGj7HIv6dkwaxWPTzzacOB0TJdNhJJM6cm8p/NqoEuk=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -28,6 +26,8 @@ buildPythonPackage rec {
|
|||
"test_declaration_junk_chars"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sgmllib"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
# Tries to download model binary artifacts:
|
||||
"tests/test_api.py"
|
||||
];
|
||||
pythonImportCheck = [ "slovnet" ];
|
||||
pythonImportsCheck = [ "slovnet" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deep-learning based NLP modeling for Russian language";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [ pymorphy2 ];
|
||||
pythonImportCheck = [ "yargy" ];
|
||||
pythonImportsCheck = [ "yargy" ];
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
pytestFlagsArray = [ "tests" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ let
|
|||
description = "Cross platform desktop application shell";
|
||||
homepage = "https://github.com/electron/electron";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ travisbhartwell manveru prusnak ];
|
||||
maintainers = with maintainers; [ travisbhartwell manveru ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]
|
||||
++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]
|
||||
++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dioxus-cli";
|
||||
version = "0.4.1";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-h2l6SHty06nLNbdlnSzH7I4XY53yyxNbx663cHYmPG0=";
|
||||
hash = "sha256-TWcuEobYH2xpuwB1S63HoP/WjH3zHXTnlXXvOcYIZG8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3pFkEC1GAJmTqXAymX4WRIq7EEtY17u1TCg+OhqL3bA=";
|
||||
cargoHash = "sha256-ozbGK46uq3qXZifyTY7DDX1+vQuDJuSOJZw35vwcuxY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config cacert ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
|
|
@ -34,6 +34,16 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=server::web::proxy::test::add_proxy_trailing_slash"
|
||||
];
|
||||
|
||||
# Omitted: --doc
|
||||
# Can be removed after 0.4.3 or when https://github.com/DioxusLabs/dioxus/pull/1706 is resolved
|
||||
# Matches upstream package test CI https://github.com/DioxusLabs/dioxus/blob/544ca5559654c8490ce444c3cbd85c1bfb8479da/Makefile.toml#L94-L108
|
||||
cargoTestFlags = [
|
||||
"--lib"
|
||||
"--bins"
|
||||
"--tests"
|
||||
"--examples"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = dioxus-cli;
|
||||
command = "${meta.mainProgram} --version";
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@ let
|
|||
# NOTE: When updating these, please also take a look at the changes done to
|
||||
# kernel config in the xanmod version commit
|
||||
ltsVariant = {
|
||||
version = "6.1.65";
|
||||
hash = "sha256-/KJCUAti/p48KTIvRdGeD4aXfhiBdjZUIKD45Hu2d1g=";
|
||||
version = "6.1.66";
|
||||
hash = "sha256-H3RTbBctvbKdsD1+G7zXVcTFb2NRON6nOzUgUW+zGxs=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.6.4";
|
||||
hash = "sha256-f/McwYD/4849GwtHml+AMSF5/gHuDrrlbz8gYZghaw0=";
|
||||
version = "6.6.5";
|
||||
hash = "sha256-lmJ5Gix+CEqIu+cyBeqBq6xLZ94PjhU+6SbzAE0D8SY=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "idsk";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "idsk";
|
||||
owner = "cpcsdk";
|
||||
rev = "v${version}";
|
||||
sha256 = "05zbdkb9s6sfkni6k927795w2fqdhnf3i7kgl27715sdmmdab05d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
|
||||
# Needed with GCC 12 but breaks on darwin (with clang)
|
||||
"-std=c++14"
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp iDSK $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manipulating CPC dsk images and files";
|
||||
homepage = "https://github.com/cpcsdk/idsk" ;
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
mainProgram = "iDSK";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnf5";
|
||||
version = "5.1.8";
|
||||
version = "5.1.9";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "rpm-software-management";
|
||||
repo = "dnf5";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-1g3g+6EborZd2ppPMZcy0Wjv07zetATHb/sCkuZz5UM=";
|
||||
hash = "sha256-H8zbxNsGkuKIDPwGWfKJEy5gTo2Mm13VKwce+h9NEro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,18 +10,18 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-cli";
|
||||
version = "2023.10.0";
|
||||
version = "2023.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "cli-v${version}";
|
||||
hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";
|
||||
hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo=";
|
||||
};
|
||||
|
||||
nodejs = nodejs_18;
|
||||
|
||||
npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";
|
||||
npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, cargo
|
||||
, copyDesktopItems
|
||||
, dbus
|
||||
, electron_25
|
||||
, electron_26
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, glib
|
||||
|
|
@ -25,16 +25,16 @@
|
|||
let
|
||||
description = "A secure and free password manager for all of your devices";
|
||||
icon = "bitwarden";
|
||||
electron = electron_25;
|
||||
electron = electron_26;
|
||||
in buildNpmPackage rec {
|
||||
pname = "bitwarden";
|
||||
version = "2023.10.1";
|
||||
version = "2023.12.0"; # TODO add back Electron version check below
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
repo = "clients";
|
||||
rev = "desktop-v${version}";
|
||||
hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws=";
|
||||
hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -49,14 +49,14 @@ in buildNpmPackage rec {
|
|||
|
||||
makeCacheWritable = true;
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc=";
|
||||
npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
name = "${pname}-${version}";
|
||||
inherit patches src;
|
||||
patchFlags = [ "-p4" ];
|
||||
sourceRoot = "${src.name}/${cargoRoot}";
|
||||
hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8=";
|
||||
hash = "sha256-pCy3hGhI3mXm4uTOaFMykOzJqK2PC0t0hE8MrJKtA/k=";
|
||||
};
|
||||
cargoRoot = "apps/desktop/desktop_native";
|
||||
|
||||
|
|
@ -82,12 +82,14 @@ in buildNpmPackage rec {
|
|||
libsecret
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# FIXME add back once upstream moves to Electron >= 26
|
||||
# we use electron_26 because electron_25 is EOL
|
||||
/*preBuild = ''
|
||||
if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
|
||||
echo 'ERROR: electron version mismatch'
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
'';*/
|
||||
|
||||
postBuild = ''
|
||||
pushd apps/desktop
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.17.01";
|
||||
version = "0.17.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-hTwA0BT8r54Gnyf/itP2onQE6zhNEoejseuIEwvx4D8=";
|
||||
hash = "sha256-9pdTxGH9Oghg0Brxi6v/3ghsuT2aX/bAGVQPNjik3Zk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -11252,6 +11252,7 @@ with pkgs;
|
|||
nomad_1_4
|
||||
nomad_1_5
|
||||
nomad_1_6
|
||||
nomad_1_7
|
||||
;
|
||||
|
||||
nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };
|
||||
|
|
@ -39217,7 +39218,7 @@ with pkgs;
|
|||
|
||||
flintqs = callPackage ../development/libraries/science/math/flintqs { };
|
||||
|
||||
getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; };
|
||||
getdp = callPackage ../applications/science/math/getdp { };
|
||||
|
||||
gurobi = callPackage ../applications/science/math/gurobi { };
|
||||
|
||||
|
|
@ -40458,8 +40459,6 @@ with pkgs;
|
|||
|
||||
utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
|
||||
|
||||
idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
colima = callPackage ../applications/virtualization/colima { };
|
||||
|
||||
lima = callPackage ../applications/virtualization/lima {
|
||||
|
|
|
|||
Loading…
Reference in a new issue