diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index 736d954d2b88..b730d591868f 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -121,6 +121,13 @@
package.
+
+
+ Resilio sync secret keys can now be provided using a secrets
+ file at runtime, preventing these secrets from ending up in
+ the Nix store.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 87caecdae034..d630b993c0f4 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -40,3 +40,5 @@ In addition to numerous new and upgraded packages, this release has the followin
- The module for the application firewall `opensnitch` got the ability to configure rules. Available as [services.opensnitch.rules](#opt-services.opensnitch.rules)
- A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).
+
+- Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store.
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index d21f108024e5..cc9495bf2383 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -8,7 +8,6 @@ let
resilioSync = pkgs.resilio-sync;
sharedFoldersRecord = map (entry: {
- secret = entry.secret;
dir = entry.directory;
use_relay_server = entry.useRelayServer;
@@ -40,6 +39,31 @@ let
shared_folders = sharedFoldersRecord;
}));
+ sharedFoldersSecretFiles = map (entry: {
+ dir = entry.directory;
+ secretFile = if builtins.hasAttr "secret" entry then
+ toString (pkgs.writeTextFile {
+ name = "secret-file";
+ text = entry.secret;
+ })
+ else
+ entry.secretFile;
+ }) cfg.sharedFolders;
+
+ runConfigPath = "/run/rslsync/config.json";
+
+ createConfig = pkgs.writeShellScriptBin "create-resilio-config" ''
+ ${pkgs.jq}/bin/jq \
+ '.shared_folders |= map(.secret = $ARGS.named[.dir])' \
+ ${
+ lib.concatMapStringsSep " \\\n "
+ (entry: ''--arg '${entry.dir}' "$(cat '${entry.secretFile}')"'')
+ sharedFoldersSecretFiles
+ } \
+ <${configFile} \
+ >${runConfigPath}
+ '';
+
in
{
options = {
@@ -186,7 +210,7 @@ in
default = [];
type = types.listOf (types.attrsOf types.anything);
example =
- [ { secret = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y";
+ [ { secretFile = "/run/resilio-secret";
directory = "/home/user/sync_test";
useRelayServer = true;
useTracker = true;
@@ -202,9 +226,6 @@ in
description = lib.mdDoc ''
Shared folder list. If enabled, web UI must be
disabled. Secrets can be generated using `rslsync --generate-secret`.
- Note that this secret will be
- put inside the Nix store, so it is realistically not very
- secret.
If you would like to be able to modify the contents of this
directories, it is recommended that you make your user a
@@ -256,10 +277,14 @@ in
Restart = "on-abort";
UMask = "0002";
User = "rslsync";
+ RuntimeDirectory = "rslsync";
+ ExecStartPre = "${createConfig}/bin/create-resilio-config";
ExecStart = ''
- ${resilioSync}/bin/rslsync --nodaemon --config ${configFile}
+ ${resilioSync}/bin/rslsync --nodaemon --config ${runConfigPath}
'';
};
};
};
+
+ meta.maintainers = with maintainers; [ jwoudenberg ];
}
diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index 48d77ce5e6fe..a5b104d31abe 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -45,13 +45,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mame";
- version = "0.249";
+ version = "0.250";
src = fetchFromGitHub {
owner = "mamedev";
repo = "mame";
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
- sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4=";
+ sha256 = "sha256-jexs/1ovRk9Is5orD7hT9fN+dYm+WA+57aZ6JH7zjL4=";
};
outputs = [ "out" "tools" ];
diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix
index 3e5a8c4cc98c..79b1d62509b7 100644
--- a/pkgs/applications/file-managers/felix-fm/default.nix
+++ b/pkgs/applications/file-managers/felix-fm/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-CLCzRnczItvnjXtS4BOc9FeBCPQm102U0bDIWAZPzYc=";
+ sha256 = "sha256-0wYYElXm7Nr1zjtWLSdBaUVsb+2CN4TwaJr5g1juUUs=";
};
- cargoSha256 = "sha256-H+uOo3Cm1nFPYyA0qOAcaD4mfSd4Uaq5U20t6V4mmcg=";
+ cargoSha256 = "sha256-SnXZkMrAhhP8lVFCd6LKHFSg9o2K1Wy+z/4oUZOHoXw=";
nativeBuildInputs = [ pkg-config ];
@@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec {
checkFlags = [
# extra test files not shipped with the repository
+ "--skip=functions::tests::test_list_up_contents"
"--skip=magic_image::tests::test_inspect_image"
"--skip=magic_packed::tests::test_inspect_signature"
];
diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
index bb879bce1572..54e3e98d48b8 100644
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
- version = "0.8.11";
+ version = "0.8.12";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
- sha256 = "sha256-c8gP7OJwnCEXnT2FQH1ttYRzZfbcJL86FX2JQezJI+s=";
+ sha256 = "sha256-I1jGPNGlZ53N3ZlN9nN/GSgQIfdoUeclyuMl+PpNVY4=";
name = "${pname}-${version}.AppImage";
};
diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix
new file mode 100644
index 000000000000..f56993247553
--- /dev/null
+++ b/pkgs/applications/misc/pw-viz/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, libGL
+, pipewire
+, xorg
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "pw-viz";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "ax9d";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1d46m7w6rzzjpxc2fxwka9xbz49szbfrl63kxlv6kw4lknrladjn";
+ };
+
+ cargoSha256 = "sha256-jx1mUP6ezpwUhmDD9tCJBhHCHU8fEMlB738yYfB1psc=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [
+ libGL
+ pipewire
+ rustPlatform.bindgenHook
+ xorg.libX11
+ xorg.libXcursor
+ xorg.libXi
+ xorg.libxcb
+ ];
+
+ postFixup = ''
+ patchelf $out/bin/pw-viz --add-rpath ${lib.makeLibraryPath [ libGL xorg.libXrandr ]}
+ '';
+
+ meta = with lib; {
+ description = "A simple and elegant pipewire graph editor ";
+ homepage = "https://github.com/ax9d/pw-viz";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ figsoda ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 3d12b11b5141..c52e96066f8c 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfreeRedistributable;
platforms = platforms.linux;
- maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ];
+ maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ];
};
}
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index d7396d5d9a61..7077d56f8069 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -21,6 +21,9 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
nativeBuildInputs = [ which ];
buildInputs = with ocamlPackages; [ dune-configurator ];
propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex seq stdlib-shims zarith ];
+ preBuild = ''
+ substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"'
+ '';
}; in
let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix
index 7fca547f67c8..565537cf439c 100644
--- a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix
+++ b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix
@@ -2,16 +2,28 @@
stdenv.mkDerivation rec {
pname = "isabelle-linter";
- version = "Isabelle2021-1-v1.0.0";
+ version = "unstable-2022-09-05";
src = fetchFromGitHub {
owner = "isabelle-prover";
repo = "isabelle-linter";
- rev = version;
- sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a";
+ rev = "0424fc05426d5f7a23adf19ad08c690c17184e86";
+ sha256 = "02afbgmi195ibichjkpni2wjgjkszv7i6qkmmprwrmb4jd2wdvd5";
};
- installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; };
+ nativeBuildInputs = [ isabelle ];
+
+ buildPhase = ''
+ export HOME=$TMP
+ isabelle components -u $(pwd)
+ isabelle scala_build
+ '';
+
+ installPhase = ''
+ dir=$out/Isabelle${isabelle.version}/contrib/${pname}-${version}
+ mkdir -p $dir
+ cp -r * $dir/
+ '';
meta = with lib; {
description = "Linter component for Isabelle.";
diff --git a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix b/pkgs/applications/science/logic/isabelle/components/mkBuild.nix
deleted file mode 100644
index a05b5196b007..000000000000
--- a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ isabelle, path }:
-
-let
- dir = "$out/isabelle/${isabelle.dirname}";
- iDir = "${isabelle}/${isabelle.dirname}";
-in ''
- shopt -s extglob
- mkdir -p ${dir}/lib/classes
-
- cDir=$out/${isabelle.dirname}/contrib/${path}
- mkdir -p $cDir
- cp -r !(isabelle) $cDir
-
- cd ${dir}
- ln -s ${iDir}/!(lib|bin) ./
- ln -s ${iDir}/lib/!(classes) lib/
- ln -s ${iDir}/lib/classes/* lib/classes/
-
- mkdir bin/
- cp ${iDir}/bin/* bin/
-
- export HOME=$TMP
- bin/isabelle components -u $cDir
- bin/isabelle scala_build
-
- cd lib/classes
- for f in ${iDir}/lib/classes/*; do
- rm $(basename $f)
- done
-
- lDir=$out/${isabelle.dirname}/lib/classes/
- mkdir -p $lDir
- cp -r * $lDir
- cd $out
- rm -rf isabelle
-''
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 009af3463a25..1bb7ede6da7b 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -1,5 +1,24 @@
-{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin, fetchhg }:
-# nettools needed for hostname
+{ lib
+, stdenv
+, fetchurl
+, coreutils
+, nettools
+, java
+, scala_3
+, polyml
+, z3
+, veriT
+, vampire
+, eprover-ho
+, naproche
+, rlwrap
+, perl
+, makeDesktopItem
+, isabelle-components
+, isabelle
+, symlinkJoin
+, fetchhg
+}:
let
sha1 = stdenv.mkDerivation {
@@ -29,7 +48,7 @@ let
};
in stdenv.mkDerivation rec {
pname = "isabelle";
- version = "2021-1";
+ version = "2022";
dirname = "Isabelle${version}";
@@ -39,26 +58,27 @@ in stdenv.mkDerivation rec {
fetchurl
{
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz";
- sha256 = "0n1ls9vwf0ps1x8zpb7c1xz1wkasgvc34h5bz280hy2z6iqwmwbc";
+ sha256 = "0b84rx9b7b5y8m1sg7xdp17j6yngd2dkx6v5bkd8h7ly102lai18";
}
else
fetchurl {
url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
- sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i";
+ sha256 = "1ih4gykkp1an43qdgc5xzyvf30fhs0dah3y0a5ksbmvmjsfnxyp7";
};
+ nativeBuildInputs = [ java ];
+
buildInputs = [ polyml z3 veriT vampire eprover-ho nettools ]
++ lib.optionals (!stdenv.isDarwin) [ java ];
- sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}";
+ sourceRoot = dirname;
- postUnpack = if stdenv.isDarwin then ''
- mv $sourceRoot ${dirname}
- sourceRoot=${dirname}
- '' else null;
+ postUnpack = lib.optionalString stdenv.isDarwin ''
+ mv $sourceRoot.app $sourceRoot
+ '';
postPatch = ''
- patchShebangs .
+ patchShebangs lib/Tools/ bin/
cat >contrib/z3*/etc/settings <&1) | @coreutils@/bin/tee $TMPDIR/testBuildFailure.log \
- | while read ln; do
+ | while IFS= read -r ln; do
echo "original builder: $ln"
done
diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix
index d6dfbe34fd21..26e622c8763f 100644
--- a/pkgs/build-support/testers/test/default.nix
+++ b/pkgs/build-support/testers/test/default.nix
@@ -29,15 +29,24 @@ lib.recurseIntoAttrs {
happy = runCommand "testBuildFailure-happy" {
failed = testers.testBuildFailure (runCommand "fail" {} ''
echo ok-ish >$out
+
echo failing though
echo also stderr 1>&2
+ echo 'line\nwith-\bbackslashes'
+ printf "incomplete line - no newline"
+
exit 3
'');
} ''
+ grep -F 'ok-ish' $failed/result
+
grep -F 'failing though' $failed/testBuildFailure.log
grep -F 'also stderr' $failed/testBuildFailure.log
- grep -F 'ok-ish' $failed/result
+ grep -F 'line\nwith-\bbackslashes' $failed/testBuildFailure.log
+ grep -F 'incomplete line - no newline' $failed/testBuildFailure.log
+
[[ 3 = $(cat $failed/testBuildFailure.exit) ]]
+
touch $out
'';
diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix
index 3aa93d2a1164..70d519e73161 100644
--- a/pkgs/data/themes/marwaita/default.nix
+++ b/pkgs/data/themes/marwaita/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "marwaita";
- version = "16.0";
+ version = "16.1";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- sha256 = "sha256-kBXGYXOrza4tb5J9hmheDhZcwEd1xT6wLUc9cBGJ/AY=";
+ sha256 = "sha256-NYJ3cVxWd3vVkjr+Ni4kmhQzL9E+paexejrNA8pRfPE=";
};
buildInputs = [
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 11787f1aa690..2ad68ffec3b3 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -21,4 +21,4 @@ stdenv.mkDerivation {
'';
inherit (bare) meta;
-}
+} // { inherit bare; }
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index c0c11b121af7..0c3b73e9fd5b 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, substituteAll, fetchurl
, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
-, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
+, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, libX11
, self, gdbm, db, xz
, python-setup-hook
# For the Python package set
@@ -53,7 +53,7 @@ in with passthru; stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
+ bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl libX11 gdbm db
] ++ optionals isPy3k [
xz
] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [
diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix
index 04f0514781bf..81c21bb68d69 100644
--- a/pkgs/development/libraries/lemon-graph/default.nix
+++ b/pkgs/development/libraries/lemon-graph/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- doCheck = true;
+ # error: no viable conversion from ...
+ doCheck = !stdenv.isDarwin;
meta = with lib; {
homepage = "https://lemon.cs.elte.hu/trac/lemon";
@@ -23,6 +24,5 @@ stdenv.mkDerivation rec {
license = licenses.boost;
maintainers = with maintainers; [ trepetti ];
platforms = platforms.all;
- broken = stdenv.isAarch64 || stdenv.isDarwin;
};
}
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 6b5f6410d54f..7ceb70bb8bcd 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "live555";
- version = "2022.07.14";
+ version = "2022.12.01";
src = fetchurl {
urls = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
];
- sha256 = "sha256-VrWkBmLdP0MYfiFit3Mtkv7Ti8dWPmrndrbKo+BpRCA=";
+ sha256 = "sha256-BXwdPcJMJrM+FMTcNZKIWt8iBAOh4SVeihAeIzxpwQg=";
};
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index 3554457d3f27..eb7e1e9acc9b 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
- version = "0.0.7";
+ version = "unstable-2022-12-01";
src = fetchFromGitHub {
owner = "elFarto";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-c74XJW9e8sgjBuTpZQOgIvgEoP73aQlx6beE6bChYfw=";
+ rev = "6e8b0d067c52c3a7e0c3de745337e6e733c59207";
+ sha256 = "sha256-HL/sjNPsLhzl8NZ/9l8in27vUrMkyUIcNr/+HhiaTT0=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 322ca7266747..f50f47413b4a 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "qtstyleplugin-kvantum";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${version}";
- sha256 = "35PrC4UZJJJgDUMv/xoz4R9HA9hidZ9HmXSgte6B+a8=";
+ sha256 = "Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 64aca1ab3eed..edbb16b0063c 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.36.0";
+ version = "3.37.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- hash = "sha256-c5AJsTR6qfBtxlTkjRpVoxDGO6TxJ6BvD9HX+Icf1ig=";
+ hash = "sha256-vhBx/NABOD2patBzI15XZqbTTtbf3rTUIDx1sYg+yYg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix
index 3202ac66f862..303a57da19da 100644
--- a/pkgs/development/python-modules/aocd/default.nix
+++ b/pkgs/development/python-modules/aocd/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "aocd";
- version = "1.2.1";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "wimglenn";
repo = "advent-of-code-data";
rev = "refs/tags/v${version}";
- sha256 = "sha256-Oz1sy+BHekI0ApDKn7hNMDvQrog6EB0JPry7SV5fxig=";
+ sha256 = "sha256-//f/VWrTKukpNea8xprGQ7jobw10g5MQnnuM6/bAcGw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index ce23142f8928..af101a7a07ef 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bleak-retry-connector";
- version = "2.8.5";
+ version = "2.8.7";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-Uct040yI4tJkdQNBAJhr/aOjMRcGkTOAnm4pzmeHNZM=";
+ hash = "sha256-V/MXy2Q8iUFmEqnUygIoPisq0ZY9gO31QEXLajYtDUo=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/functorch/default.nix b/pkgs/development/python-modules/functorch/default.nix
deleted file mode 100644
index 033f0a3b4fda..000000000000
--- a/pkgs/development/python-modules/functorch/default.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ buildPythonPackage
-, expecttest
-, fetchFromGitHub
-, lib
-, ninja
-, pytestCheckHook
-, python
-, torch
-, pybind11
-, which
-}:
-
-buildPythonPackage rec {
- pname = "functorch";
- version = "0.2.0";
- format = "setuptools";
-
- src = fetchFromGitHub {
- owner = "pytorch";
- repo = pname;
- rev = "refs/tags/v${version}";
- hash = "sha256-33skKk5aAIHn+1149ifolXPA+tpQ+WROAZvwPeGBbrA=";
- };
-
- # Somewhat surprisingly pytorch is actually necessary for the build process.
- # `setup.py` imports `torch.utils.cpp_extension`.
- nativeBuildInputs = [
- ninja
- torch
- which
- ];
-
- buildInputs = [
- pybind11
- ];
-
- preCheck = ''
- rm -rf functorch/
- '';
-
- checkInputs = [
- expecttest
- pytestCheckHook
- ];
-
- # See https://github.com/pytorch/functorch/issues/835.
- disabledTests = [
- # RuntimeError: ("('...', '') is in PyTorch's OpInfo db ", "but is not in functorch's OpInfo db. Please regenerate ", '... and add the new tests to ', 'denylists if necessary.')
- "test_coverage_bernoulli_cpu_float32"
- "test_coverage_column_stack_cpu_float32"
- "test_coverage_diagflat_cpu_float32"
- "test_coverage_flatten_cpu_float32"
- "test_coverage_linalg_lu_factor_cpu_float32"
- "test_coverage_linalg_lu_factor_ex_cpu_float32"
- "test_coverage_multinomial_cpu_float32"
- "test_coverage_nn_functional_dropout2d_cpu_float32"
- "test_coverage_nn_functional_feature_alpha_dropout_with_train_cpu_float32"
- "test_coverage_nn_functional_feature_alpha_dropout_without_train_cpu_float32"
- "test_coverage_nn_functional_kl_div_cpu_float32"
- "test_coverage_normal_cpu_float32"
- "test_coverage_normal_number_mean_cpu_float32"
- "test_coverage_pca_lowrank_cpu_float32"
- "test_coverage_round_decimals_0_cpu_float32"
- "test_coverage_round_decimals_3_cpu_float32"
- "test_coverage_round_decimals_neg_3_cpu_float32"
- "test_coverage_scatter_reduce_cpu_float32"
- "test_coverage_svd_lowrank_cpu_float32"
-
- # > self.assertEqual(len(functorch_lagging_op_db), len(op_db))
- # E AssertionError: Scalars are not equal!
- # E
- # E Absolute difference: 19
- # E Relative difference: 0.03525046382189239
- "test_functorch_lagging_op_db_has_opinfos_cpu"
-
- # RuntimeError: PyTorch not compiled with LLVM support!
- "test_bias_gelu"
- "test_binary_ops"
- "test_broadcast1"
- "test_broadcast2"
- "test_float_double"
- "test_float_int"
- "test_fx_trace"
- "test_int_long"
- "test_issue57611"
- "test_slice1"
- "test_slice2"
- "test_transposed1"
- "test_transposed2"
- "test_unary_ops"
- ];
-
- pythonImportsCheck = [ "functorch" ];
-
- meta = with lib; {
- description = "JAX-like composable function transforms for PyTorch";
- homepage = "https://pytorch.org/functorch";
- license = licenses.bsd3;
- maintainers = with maintainers; [ samuela ];
- # See https://github.com/NixOS/nixpkgs/pull/174248#issuecomment-1139895064.
- platforms = platforms.x86_64;
- };
-}
diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix
index ac83f1015726..74329e05d297 100644
--- a/pkgs/development/python-modules/torch/bin.nix
+++ b/pkgs/development/python-modules/torch/bin.nix
@@ -20,7 +20,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
- version = "1.12.1";
+ version = "1.13.0";
in buildPythonPackage {
inherit version;
diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix
index 2169e1873b0b..86948e33a3fc 100644
--- a/pkgs/development/python-modules/torch/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/binary-hashes.nix
@@ -6,61 +6,61 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version {
- "1.12.1" = {
+ "1.13.0" = {
x86_64-linux-37 = {
- name = "torch-1.12.1-cp37-cp37m-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl";
- hash = "sha256-/JtHhuxUvmfqqLDHyZmeL0riuJocGOQd4VFaGQRAxpE=";
+ name = "torch-1.13.0-cp37-cp37m-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp37-cp37m-linux_x86_64.whl";
+ hash = "sha256-GRxMQkGgtodNIUUxkHpaQZoYz36ogT0zJSqJlcTwbH4=";
};
x86_64-linux-38 = {
- name = "torch-1.12.1-cp38-cp38-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl";
- hash = "sha256-3aMSkBIgiVCHzIPTZlRko9wXHQRGDGHDGvRj77+1SJY=";
+ name = "torch-1.13.0-cp38-cp38-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp38-cp38-linux_x86_64.whl";
+ hash = "sha256-VsudhAGP8v02zblKMPz5LvZBVX2/OHEMQRoYzvMhUF8=";
};
x86_64-linux-39 = {
- name = "torch-1.12.1-cp39-cp39-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl";
- hash = "sha256-dyVCDavr/K9EmE7c4yg+6pH5jw99WHS8aMehZL2BJuM=";
+ name = "torch-1.13.0-cp39-cp39-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp39-cp39-linux_x86_64.whl";
+ hash = "sha256-Ep2VJJ/iDM2D0VYyOl4qarqD4YhBoArHJOJwrYBt1JM=";
};
x86_64-linux-310 = {
- name = "torch-1.12.1-cp310-cp310-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torch-1.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl";
- hash = "sha256-trwxJEqigYkp+7MMSDwiHfRx6dhW6AXFof9ysTGunns=";
+ name = "torch-1.13.0-cp310-cp310-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torch-1.13.0%2Bcu116-cp310-cp310-linux_x86_64.whl";
+ hash = "sha256-MSGHkzNHdbxjr5Xh6jsYaU6qkCrupf2bMhWrryLq+tA=";
};
x86_64-darwin-37 = {
- name = "torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp37-none-macosx_10_9_x86_64.whl";
- hash = "sha256-ijSi+7qgfJIeGyA/WdPW4A7TefKzhERXc70U4yiltsg=";
+ name = "torch-1.13.0-cp37-none-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp37-none-macosx_10_9_x86_64.whl";
+ hash = "sha256-zR5n22V14bFzpiYHelTkkREzF4VXqsUGg9sDo04rY2o=";
};
x86_64-darwin-38 = {
- name = "torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_10_9_x86_64.whl";
- hash = "sha256-qDILqa2H6AylpqAW5GraTRugxUYm4TXZmyEppFQcUJ0=";
+ name = "torch-1.13.0-cp38-none-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp38-none-macosx_10_9_x86_64.whl";
+ hash = "sha256-75NKIdpvalFtCpxxKoDQnFYSir3Gr43BUb7lGZtMO04=";
};
x86_64-darwin-39 = {
- name = "torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_10_9_x86_64.whl";
- hash = "sha256-v+woQ9qmVPBP2iO6gjrwPntvdlCoc823JnUtDjcY2to=";
+ name = "torch-1.13.0-cp39-none-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp39-none-macosx_10_9_x86_64.whl";
+ hash = "sha256-kipJEGE7MQ++uHcH8Ay3b+wyjrYMwTSe0hc+fJtu3Ng=";
};
x86_64-darwin-310 = {
- name = "torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_10_9_x86_64.whl";
- hash = "sha256-l2w/mXzqOO6RoN08OkIyJ4VBR0jRdh75JreJ36l8YTQ=";
+ name = "torch-1.13.0-cp310-none-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp310-none-macosx_10_9_x86_64.whl";
+ hash = "sha256-SalJuBNrMrLsByTL9MZni1TpdLfWjxnxIx7qIc3lwjs=";
};
aarch64-darwin-38 = {
- name = "torch-1.12.1-cp38-none-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp38-none-macosx_11_0_arm64.whl";
- hash = "sha256-A+McN3Edss0gHgLeWCbeh1Up5FpVYx0xeq3OLx7UWqg=";
+ name = "torch-1.13.0-cp38-none-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp38-none-macosx_11_0_arm64.whl";
+ hash = "sha256-8Bqa4NS2nS/EFF6L6rRbeHc0Ld29SDin08Ecp/ZoB0U=";
};
aarch64-darwin-39 = {
- name = "torch-1.12.1-cp39-none-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp39-none-macosx_11_0_arm64.whl";
- hash = "sha256-af4srnw5zK3WWhI3k9MODbiB8cGSeUVRnFwXMjExQ34=";
+ name = "torch-1.13.0-cp39-none-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp39-none-macosx_11_0_arm64.whl";
+ hash = "sha256-R/5iKDhr/210MZov/p1O2UPm6FRz146AUCUYxgfWRNI=";
};
aarch64-darwin-310 = {
- name = "torch-1.12.1-cp310-none-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torch-1.12.1-cp310-none-macosx_11_0_arm64.whl";
- hash = "sha256-aBBORxWlXEuymoXGqNV9gg4HV9o2O+G6aA+ozFvhe1I=";
+ name = "torch-1.13.0-cp310-none-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torch-1.13.0-cp310-none-macosx_11_0_arm64.whl";
+ hash = "sha256-D904yWIwlHse2HD+1KVgJS+NI8Oiv02rnS1CsY8uZ8g=";
};
};
}
diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index 2c619f46ac37..887738f2c5ff 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -124,7 +124,7 @@ let
in buildPythonPackage rec {
pname = "torch";
# Don't forget to update torch-bin to the same version.
- version = "1.12.1";
+ version = "1.13.0";
format = "setuptools";
disabled = pythonOlder "3.7.0";
@@ -140,7 +140,7 @@ in buildPythonPackage rec {
repo = "pytorch";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
- hash = "sha256-8378BVOBFCRYRG1+yIYFSPKmb1rFOLgR+8pNZKt9NfI=";
+ hash = "sha256-jlXd+9fYWePDevXRxsjtL4oEdTWirv1ObH0B4A6o6Q4=";
};
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index 7388bbc7d26f..f4bac910e44b 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "torchaudio";
- version = "0.12.1";
+ version = "0.13.0";
format = "wheel";
src =
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index 8731c63787cf..6d250f5e429a 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -6,61 +6,61 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version {
- "0.12.1" = {
+ "0.13.0" = {
x86_64-linux-37 = {
- name = "torchaudio-0.12.1-cp37-cp37m-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp37-cp37m-linux_x86_64.whl";
- hash = "sha256-8Z72lazhnV2ZBtnvpdm5ZHhiyE/wHwEpQ9UzZoi//mw=";
+ name = "torchaudio-0.13.0-cp37-cp37m-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp37-cp37m-linux_x86_64.whl";
+ hash = "sha256-OvF+dT8O2tLcb4bfIyWLUooFuAjBnYfK+PeuL9WKmWk=";
};
x86_64-linux-38 = {
- name = "torchaudio-0.12.1-cp38-cp38-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp38-cp38-linux_x86_64.whl";
- hash = "sha256-CCtZ6eUhs/6kaoU0HwDDaK4JTSFKkVJF+OMAu368Zno=";
+ name = "torchaudio-0.13.0-cp38-cp38-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp38-cp38-linux_x86_64.whl";
+ hash = "sha256-bdL04MnHV95l93Bht8md/bMZHPKu7L6+PUReWdjZ27Y=";
};
x86_64-linux-39 = {
- name = "torchaudio-0.12.1-cp39-cp39-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp39-cp39-linux_x86_64.whl";
- hash = "sha256-pNa5fV9vC1cXeDLhHTCscO7RO2lst2Vmm0K7NzINqgw=";
+ name = "torchaudio-0.13.0-cp39-cp39-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp39-cp39-linux_x86_64.whl";
+ hash = "sha256-gY+ISeHQukn5OxpU4h/sfBXGDoMpp2a/ojfsMb/bKfs=";
};
x86_64-linux-310 = {
- name = "torchaudio-0.12.1-cp310-cp310-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchaudio-0.12.1%2Bcu116-cp310-cp310-linux_x86_64.whl";
- hash = "sha256-KdeBVGBQ1lQxXxCQGwX17E1iptMis0Rfex++o4JmVog=";
+ name = "torchaudio-0.13.0-cp310-cp310-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchaudio-0.13.0%2Bcu116-cp310-cp310-linux_x86_64.whl";
+ hash = "sha256-BV1qgrCA1o8wF0gh8F2qGKMaTVph42i4Yhshwibt1cM=";
};
x86_64-darwin-37 = {
- name = "torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp37-cp37m-macosx_10_9_x86_64.whl";
- hash = "sha256-I9vPN68vQdSRwDN8qUUB7H71iK2xdm4esoAz+sVJu9k=";
+ name = "torchaudio-0.13.0-cp37-cp37m-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp37-cp37m-macosx_10_9_x86_64.whl";
+ hash = "sha256-UjOFPP1gy/OmsBlOQB2gqKhXV/SyLc70X+vF00r3src=";
};
x86_64-darwin-38 = {
- name = "torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp38-cp38-macosx_10_9_x86_64.whl";
- hash = "sha256-pMjBWx6BCpO7d7J/pJFZvqIlO1k++UA5lG7Emu9Rdk8=";
+ name = "torchaudio-0.13.0-cp38-cp38-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp38-cp38-macosx_10_9_x86_64.whl";
+ hash = "sha256-QuigF0HACNRPZIDOBkbHSF2YwpwBXHNiUWbbEkByn3Y=";
};
x86_64-darwin-39 = {
- name = "torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp39-cp39-macosx_10_9_x86_64.whl";
- hash = "sha256-CPkrxTaC07rYYG3ttwpJ5aD3z5MGyRc/B027qXeFRC4=";
+ name = "torchaudio-0.13.0-cp39-cp39-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp39-cp39-macosx_10_9_x86_64.whl";
+ hash = "sha256-i/P/vBwdJUJimtHsBkzwG8RiIN53pJo5s2xnB+aMlU8=";
};
x86_64-darwin-310 = {
- name = "torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchaudio-0.12.1-cp310-cp310-macosx_10_9_x86_64.whl";
- hash = "sha256-3BOL7gayMFRC/BMhcfKgHV9CUJ6qIb34fD0mpvSgn90=";
+ name = "torchaudio-0.13.0-cp310-cp310-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchaudio-0.13.0-cp310-cp310-macosx_10_9_x86_64.whl";
+ hash = "sha256-K3vMX0qIFMIqZrVa0tjiMBXAgazJkGPtry0VLI+wzns=";
};
aarch64-darwin-38 = {
- name = "torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp38-cp38-macosx_11_0_arm64.whl";
- hash = "sha256-g8CLcabcjiPB17AHgKu55MKVKOR6bmRP497nrCJjgh4=";
+ name = "torchaudio-0.13.0-cp38-cp38-macosx_12_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.0-cp38-cp38-macosx_12_0_arm64.whl";
+ hash = "sha256-qr3i19PWbi1eR0Y0XWGXLifWY2C4/bObnq3KTHOWRxM=";
};
aarch64-darwin-39 = {
- name = "torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp39-cp39-macosx_11_0_arm64.whl";
- hash = "sha256-L8WivI6KrUdbxRnzyCuWSeFLXGV0h/+nEs98UUFD6dc=";
+ name = "torchaudio-0.13.0-cp39-cp39-macosx_12_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.0-cp39-cp39-macosx_12_0_arm64.whl";
+ hash = "sha256-uQnAQRdWGwDV5rZTHTIO2kIjZ4mHoJyDJsFqCyNVbcA=";
};
aarch64-darwin-310 = {
- name = "torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torchaudio-0.12.1-cp310-cp310-macosx_11_0_arm64.whl";
- hash = "sha256-HYH3GDfV1b5lHoXKn6k3fstFE7ASnd+wJVQOHCQG0+Y=";
+ name = "torchaudio-0.13.0-cp310-cp310-macosx_12_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.0-cp310-cp310-macosx_12_0_arm64.whl";
+ hash = "sha256-6gUo8Kccm1FRjTBGActHx1N01uq6COFnlMH5lmOuTCA=";
};
};
}
diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh
index 72b919c479dd..807129f227ea 100755
--- a/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/pkgs/development/python-modules/torchaudio/prefetch.sh
@@ -18,9 +18,9 @@ url_and_key_list=(
"x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl"
"x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl"
"x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl"
- "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl"
- "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl"
- "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl"
+ "aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl"
+ "aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl"
+ "aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl"
)
hashfile=binary-hashes-"$version".nix
diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix
index c18f1c68be98..f751a046aeca 100644
--- a/pkgs/development/python-modules/torchinfo/default.nix
+++ b/pkgs/development/python-modules/torchinfo/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "torchinfo";
- version = "1.64";
+ version = "1.7.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "TylerYep";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU=";
+ hash = "sha256-jiQ24gx3N9djvTTB6IthzxcuGWX2/php0Up3IdEDvm8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index e1a0055af260..8334f569469a 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -16,7 +16,7 @@ let
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
srcs = import ./binary-hashes.nix version;
unsupported = throw "Unsupported system";
- version = "0.13.1";
+ version = "0.14.0";
in buildPythonPackage {
inherit version;
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 9b6301bab2c3..5ebf5b6f01ef 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -6,61 +6,61 @@
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
version : builtins.getAttr version {
- "0.13.1" = {
+ "0.14.0" = {
x86_64-linux-37 = {
- name = "torchvision-0.13.1-cp37-cp37m-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp37-cp37m-linux_x86_64.whl";
- hash = "sha256-3PMvbZmEk+duwho4u7hWt0Ailc96Z/sJzlvefn5yV1Y=";
+ name = "torchvision-0.14.0-cp37-cp37m-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp37-cp37m-linux_x86_64.whl";
+ hash = "sha256-IuZAWuVKUv+kIppkj4EjqaqHbPEidmpOhFzaOkQOIws=";
};
x86_64-linux-38 = {
- name = "torchvision-0.13.1-cp38-cp38-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp38-cp38-linux_x86_64.whl";
- hash = "sha256-w86ys/RW8MmEr3HvVfhjfxeKKdw+E6ZvuwEM7q0okeE=";
+ name = "torchvision-0.14.0-cp38-cp38-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp38-cp38-linux_x86_64.whl";
+ hash = "sha256-DsInXsr//MOf2YwXPhVDo5ZeL86TPwzqeNpjRAPk2bk=";
};
x86_64-linux-39 = {
- name = "torchvision-0.13.1-cp39-cp39-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp39-cp39-linux_x86_64.whl";
- hash = "sha256-dZhqvlchOCWOuXlctM1z9Asr34N0/voa9v9rsNvJcsY=";
+ name = "torchvision-0.14.0-cp39-cp39-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp39-cp39-linux_x86_64.whl";
+ hash = "sha256-0kLPJk8atPVYMCjFqK1Q1YhIA8m4NpkspayPdT5L6Ow=";
};
x86_64-linux-310 = {
- name = "torchvision-0.13.1-cp310-cp310-linux_x86_64.whl";
- url = "https://download.pytorch.org/whl/cu116/torchvision-0.13.1%2Bcu116-cp310-cp310-linux_x86_64.whl";
- hash = "sha256-DJorYFrDD89HXWD3m6N4rwBzoi3lhUU/jD3WwUUqubw=";
+ name = "torchvision-0.14.0-cp310-cp310-linux_x86_64.whl";
+ url = "https://download.pytorch.org/whl/cu116/torchvision-0.14.0%2Bcu116-cp310-cp310-linux_x86_64.whl";
+ hash = "sha256-65W6LC8V57riwtmKi95b8L4aHBcMgZSBUepkho7Q6Yc=";
};
x86_64-darwin-37 = {
- name = "torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl";
- hash = "sha256-XmMSQb7jZh3mT4NhZlYiSvLjUS6yWA2nwI4IuMllqKw=";
+ name = "torchvision-0.14.0-cp37-cp37m-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp37-cp37m-macosx_10_9_x86_64.whl";
+ hash = "sha256-9rQd9eTa9u4hthrlp3q8znv30PdZbJILpJGf57dyfyA=";
};
x86_64-darwin-38 = {
- name = "torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
- hash = "sha256-8jChpA7XDVHkY85D3yQ+xSCQL4cl3iUC5IXvxe6p2GQ=";
+ name = "torchvision-0.14.0-cp38-cp38-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp38-cp38-macosx_10_9_x86_64.whl";
+ hash = "sha256-ASPQKAxUeql2aVSSixq5ryElqIYfU68jwH5Wru8PJSA=";
};
x86_64-darwin-39 = {
- name = "torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl";
- hash = "sha256-Api647Caw2GGYIhDQAjYK5nWRY/oiIyN+Qcg70s0fUQ=";
+ name = "torchvision-0.14.0-cp39-cp39-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp39-cp39-macosx_10_9_x86_64.whl";
+ hash = "sha256-amqnKATP+VUMu4kPmMfp/yas38SAZNESn68bv+r2Cgo=";
};
x86_64-darwin-310 = {
- name = "torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl";
- url = "https://download.pytorch.org/whl/torchvision-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl";
- hash = "sha256-GShqczxp3L1Be4Z5PfgHvSJ9tXhu14fBcpd0GpsND8c=";
+ name = "torchvision-0.14.0-cp310-cp310-macosx_10_9_x86_64.whl";
+ url = "https://download.pytorch.org/whl/torchvision-0.14.0-cp310-cp310-macosx_10_9_x86_64.whl";
+ hash = "sha256-e24XBnYOrOAlfrsGd0BM3WT0z4iAS8Y3n2lM8+1HBZE=";
};
aarch64-darwin-38 = {
- name = "torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp38-cp38-macosx_11_0_arm64.whl";
- hash = "sha256-6aVjiU+fpAaS4k0apYw+8EBFABfP7TWY/5Y39ATz/js=";
+ name = "torchvision-0.14.0-cp38-cp38-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.0-cp38-cp38-macosx_11_0_arm64.whl";
+ hash = "sha256-aBEEGMgzoQFT44KwOUWY3RaauCOiFoE5x7T2LqSKREY=";
};
aarch64-darwin-39 = {
- name = "torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp39-cp39-macosx_11_0_arm64.whl";
- hash = "sha256-xe1gnIvIjFdSJkALIjLgMJCUR3yCrziVLgNz7e8AA/0=";
+ name = "torchvision-0.14.0-cp39-cp39-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.0-cp39-cp39-macosx_11_0_arm64.whl";
+ hash = "sha256-HEd9u4/20OHHhHqpS1U0cHbGZIY67Wnot5M1yxJnTBs=";
};
aarch64-darwin-310 = {
- name = "torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl";
- url = "https://download.pytorch.org/whl/cpu/torchvision-0.13.1-cp310-cp310-macosx_11_0_arm64.whl";
- hash = "sha256-CPWS6mGDbr7Otcl/TXqBO519xlG7985EAVY8z65qIfw=";
+ name = "torchvision-0.14.0-cp310-cp310-macosx_11_0_arm64.whl";
+ url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.0-cp310-cp310-macosx_11_0_arm64.whl";
+ hash = "sha256-HbVwFKaUboYz4fKGOq6kfVs+dCT5QTarXVCGGm2zVpg=";
};
};
}
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index c44413ba4948..223ef3f1d861 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -24,13 +24,13 @@ let
cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList;
in buildPythonPackage rec {
pname = "torchvision";
- version = "0.13.1";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "pytorch";
repo = "vision";
rev = "refs/tags/v${version}";
- hash = "sha256-QlUAFAG6zEDCDSXR5n2CznspU3fT0kbqySzofGLPgK4=";
+ hash = "sha256-uoy9okPvFH89FJPRRFseHQisw42mWCSuPNADoGa39fc=";
};
nativeBuildInputs = [ libpng ninja which ]
diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index 29c91a2a1505..3e1fd733ceb9 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -18,35 +18,35 @@ let
"8.1" = "blackfire-20210902";
}.${phpMajor} or (throw "Unsupported PHP version.");
- version = "1.78.1";
+ version = "1.84.0";
hashes = {
"x86_64-linux" = {
system = "amd64";
- sha256 = "Q9VuZewJ/KX2ZL77d3YLsE80B0y3RYg/hE2H14s9An4=";
+ sha256 = "4tAqe1ev2s4ZwzPptgXuVL4ZXF37ieGyonBxOFMUKTs=";
};
"i686-linux" = {
system = "i386";
- sha256 = "YBt6OAeUsQZUyf7P6jIvknq2K0fGWl0xmJkEXFBlTyE=";
+ sha256 = "OPvn1zcBJDfUu7m3evRayVZNuZJ/KLblm6u4P0z0CvU=";
};
"aarch64-linux" = {
system = "arm64";
- sha256 = "NTM3xdu+60EBz7pbRyTvhrvvZWVn4tl+LgnkHG1IpYM=";
+ sha256 = "5P6tVYshPsR4Xl8sCYFuNIRf8LvE6PxWpynP3ZzoP0s=";
};
"aarch64-darwin" = {
system = "arm64";
sha256 = {
"7.4" = {
- normal = "4raEYMELZjWfC82348l94G9MTHX2jnF+ZvF4AAxN9JA=";
- zts = "HWrcLRZeyFtfJId42iHDN2ci0kTfRoXC/pEv2tObNT8=";
+ normal = "wNv5LiCbkiyPQFH1jr4Aw4kjHnpqxPa427H4nzNkE8A=";
+ zts = "FmvzFtukFZPqOz6wkFEtXrb+H8A9bb6ZqeEN9jjtwOQ=";
};
"8.0" = {
- normal = "kRTULbqlaK3bXRC8WQ1npeZHqWnuobN7eO20oYD5OIE=";
- zts = "vWmSXueMIdi+hwmmhCQcltywphLjsNQoCW7eN2KDRvc=";
+ normal = "tEGMtQf/K5x+dTEd067nhalezmWLKf1A4hM7HM1iwNE=";
+ zts = "ivbcoqM2U4Zh86+AAml8bHQEn1731A9XsCqW8ai6oKg=";
};
"8.1" = {
- normal = "JSM/HC2ZYaSBl+cSUtaKQBYPziKk013mwyW9S4DoXFA=";
- zts = "9OMm9rEs0o+daxhZdSps4NWQJegLU09zd3SLclGDOns=";
+ normal = "9GFqlGS2qZWSUoOyYb86RyFdUx2AkQlcq6N2cWHFQ2s=";
+ zts = "KnxJUxenPxPw0Mo6GdtyLpPN06/K0cSHk2cf7Akf3BE=";
};
};
};
@@ -54,16 +54,16 @@ let
system = "amd64";
sha256 = {
"7.4" = {
- normal = "rWaf0Vjkrj78q+64Zy7gJ94Lfwd8waMaOWqoPqRJLRw=";
- zts = "zU4cPAWc4k1OEho0fZKutcJ06LstSZhA4U18zx9nfi0=";
+ normal = "s6aS3INNzOMIV0qW5ROrjX68obnixsOZ4ktnDb/3dGo=";
+ zts = "4OdHSLLMo9tSVQnaTYfzogeloYPvHxbHhQgACo2V7zA=";
};
"8.0" = {
- normal = "huGvDPaAmfy8YM6Bg3Y0Ys6JhfIdddOXl1DnnRQsvoE=";
- zts = "V4QWMdMhbjQtb2M7g+oHvqy+Mv0Y9j9MwyqeuMZfYkg=";
+ normal = "JZ6ITbzW7nHmJEQv2KXKPjU9wkY7mH6+tFRJFhJw7ug=";
+ zts = "x/uP64Ec2tvUylmnWfxsqJMUNlVsFnrxK3CWHdXfgus=";
};
"8.1" = {
- normal = "pnxegrKPe8WoYAcrnBJanoYT1rg8nO8kQ7SJXQJfymg=";
- zts = "m0grZ4Xl6Sm5ZPvmS6mcJGcQOA2ECPJKvzmccqPlyBE=";
+ normal = "foK+vRwM6PHgToYiPVZIXde18jYJ3bV0Gz23bNS1UYg=";
+ zts = "LhaaUhOSnAPqHn7LqPgq2UOkS/MoY3CHcpGoFeh+hyo=";
};
};
};
@@ -92,6 +92,7 @@ let
};
self = stdenv.mkDerivation rec {
pname = "php-blackfire";
+ extensionName = "blackfire";
inherit version;
src = makeSource {
diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix
new file mode 100644
index 000000000000..9a9529bfb5b4
--- /dev/null
+++ b/pkgs/development/tools/misc/topiary/default.nix
@@ -0,0 +1,28 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "topiary";
+ version = "unstable-2022-12-02";
+
+ src = fetchFromGitHub {
+ owner = "tweag";
+ repo = pname;
+ rev = "ae861a30097bd6297f553eb0ea2597f86f16d156";
+ sha256 = "sha256-WVrl+LxWSbHkbFGbkUhmw4Klwg6CzfnLAz8F0mF0kb8=";
+ };
+
+ cargoSha256 = "sha256-qoCOcYp1NYz/YhIBP6AkCCudVLpqhztRehc2xZoYp9A=";
+
+ postInstall = ''
+ install -Dm444 languages/* -t $out/share/languages
+ '';
+
+ TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
+
+ meta = with lib; {
+ description = "A uniform formatter for simple languages, as part of the Tree-sitter ecosystem";
+ homepage = "https://github.com/tweag/topiary";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix
index 6eec582e212b..64580d8ad8b3 100644
--- a/pkgs/development/tools/rust/cargo-auditable/default.nix
+++ b/pkgs/development/tools/rust/cargo-auditable/default.nix
@@ -2,20 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-auditable";
- version = "0.5.4";
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "rust-secure-code";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-udn/Z+raf/fkJ5M/FSH9Au+J9ASu0rz6ZJSl8P+jLT4=";
+ sha256 = "sha256-mEmTgd7sC2jmYeb5pEO985v/aWWKlq/mSQUAGi32loY=";
};
- cargoSha256 = "sha256-k3wWdlLYGZZ44IHatXWq8TK2xCia3YES2jX286QkNH0=";
+ cargoSha256 = "sha256-G72UUqvFaTY/GQSkpz1wIzjb7vIWuAjvKMZosUB6YsA=";
meta = with lib; {
description = "A tool to make production Rust binaries auditable";
homepage = "https://github.com/rust-secure-code/cargo-auditable";
+ changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/cargo-auditable/CHANGELOG.md";
license = with licenses; [ mit /* or */ asl20 ];
maintainers = with maintainers; [ figsoda ];
};
diff --git a/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch
new file mode 100644
index 000000000000..a7d17b59a35b
--- /dev/null
+++ b/pkgs/games/BeatSaberModManager/add-runtime-identifier.patch
@@ -0,0 +1,12 @@
+--- a/BeatSaberModManager/BeatSaberModManager.csproj
++++ b/BeatSaberModManager/BeatSaberModManager.csproj
+@@ -14,6 +14,7 @@
+ true
+ true
+ Resources/Icons/Icon.ico
++ @runtimeIdentifier@
+
+
+
+
+Diff finished. Tue Oct 18 23:16:23 2022
diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/games/BeatSaberModManager/default.nix
new file mode 100644
index 000000000000..eec57d7cf0dd
--- /dev/null
+++ b/pkgs/games/BeatSaberModManager/default.nix
@@ -0,0 +1,68 @@
+{
+ lib,
+ dotnet-sdk,
+ targetPlatform,
+ substituteAll,
+
+ buildDotnetModule,
+ fetchFromGitHub,
+
+ libX11,
+ libICE,
+ libSM,
+ fontconfig,
+}:
+
+buildDotnetModule rec {
+ pname = "BeatSaberModManager";
+ version = "0.0.2";
+
+ src = fetchFromGitHub {
+ owner = "affederaffe";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-6+9pWr8jJzs430Ai2ddh/2DK3C2bQA1e1+BNDrKhyzY=";
+ fetchSubmodules = true; # It vendors BSIPA-Linux
+ };
+
+ # This _must_ be specified in the project file and it can only be one so
+ # obviously you wouldn't specify it as an upstream project. Typical M$.
+ # https://github.com/NixOS/nixpkgs/pull/196648#discussion_r998709996
+ # https://github.com/affederaffe/BeatSaberModManager/issues/5
+ patches = [
+ (substituteAll {
+ src = ./add-runtime-identifier.patch;
+ runtimeIdentifier = dotnet-sdk.passthru.systemToDotnetRid targetPlatform.system;
+ })
+ ];
+
+ nugetDeps = ./deps.nix;
+
+ runtimeDeps = [
+ libX11
+ libICE
+ libSM
+ fontconfig
+ ];
+
+ meta = with lib; {
+ description = "Yet another mod installer for Beat Saber, heavily inspired by ModAssistant";
+ homepage = "https://github.com/affederaffe/BeatSaberModManager";
+ longDescription = ''
+ BeatSaberModManager is yet another mod installer for Beat Saber, heavily inspired by ModAssistant
+ It strives to look more visually appealing and support both Windows and Linux, while still being as feature-rich as ModAssistant.
+
+ Features
+
+ - Windows and Linux support
+ - Dependency resolution
+ - Installed mod detection
+ - Mod uninstallation
+ - Theming support
+ - OneClick⢠support for BeatSaver, ModelSaber and Playlists
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ atemu ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix
new file mode 100644
index 000000000000..8a0f34b7cabe
--- /dev/null
+++ b/pkgs/games/BeatSaberModManager/deps.nix
@@ -0,0 +1,73 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }: [
+ (fetchNuGet { pname = "Avalonia"; version = "0.10.16"; sha256 = "1197xyswinazahjd8mhfsrjszhcv4mdj48c56bmdlcsf6zbpravz"; })
+ (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; })
+ (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.16"; sha256 = "1xlg7r9r77fc9bcjw3rnnknncny7mcnkin6nwhg0sig4ab6givd2"; })
+ (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.16"; sha256 = "09fg9j411kq0012wvix1bxiybif3pm1if624mwg4ng7w2z97dfl3"; })
+ (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.16"; sha256 = "1rxcbsbszgyb77gxp4zvg9k1cxw40vbm1z04dn5dqp4bfam9gnnh"; })
+ (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.16"; sha256 = "10p93y3zr8aq8malahdllknk28afr0p2n7fz1c7hbhbkdpfjz01a"; })
+ (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.16"; sha256 = "1m6cgql12rkzxxzvyxd1d0f5z2k4myby6d90li5p3nhblswx6jpk"; })
+ (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.16"; sha256 = "1cp1i07v1pkbff2qm046r1g517lw14q3vrli6f2k0i6aw7naay80"; })
+ (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.16"; sha256 = "00iv96n2q2qg34zgqzcaja39396fbk8fj373d7zld46c64kf8g4h"; })
+ (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.16"; sha256 = "1rla042nc9mc36qnpipszrf0sffwi5d83cr9dmihpa015bby42pz"; })
+ (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.16"; sha256 = "171jv4hdi2r0wgmrjv8ajnjmwrf9j2d0g4ffyhhmmjnaclckgzgv"; })
+ (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.16"; sha256 = "0yr8vkn59phlgcjkhzyygn2i3ghzhvd64sy84qyxxxyfm376cyxr"; })
+ (fetchNuGet { pname = "DryIoc.dll"; version = "5.1.0"; sha256 = "0vim3xmaajnvhwz01028lizjl2j0y2r2cbiwz0ga7n903pncrahw"; })
+ (fetchNuGet { pname = "DynamicData"; version = "7.9.4"; sha256 = "0mfmlsdd48dpwiphqhq8gsix2528mc6anp7rakd6vyzmig60f520"; })
+ (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; })
+ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; })
+ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; })
+ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; })
+ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; })
+ (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; })
+ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })
+ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
+ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
+ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
+ (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
+ (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
+ (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; })
+ (fetchNuGet { pname = "ReactiveUI"; version = "18.2.9"; sha256 = "156747759npb2dgsnd2y1bq2vnmmssizsz78kf80mr8pd60wlbj4"; })
+ (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; })
+ (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; })
+ (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; })
+ (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; })
+ (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; })
+ (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; })
+ (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; })
+ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; })
+ (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; })
+ (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; })
+ (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; })
+ (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; })
+ (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; })
+ (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; })
+ (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; })
+ (fetchNuGet { pname = "Splat"; version = "14.3.4"; sha256 = "1j5riry4hc6gmw6zkwqq4fsw4rcddnb8kwyhnb321qp60z8v8pv4"; })
+ (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
+ (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; })
+ (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
+ (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
+ (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
+ (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; })
+ (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; })
+ (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
+ (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
+ (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; })
+ (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
+ (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
+ (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
+ (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
+ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; })
+ (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; })
+ (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
+ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
+ (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
+ (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
+ (fetchNuGet { pname = "ThisAssembly.AssemblyInfo"; version = "1.0.9"; sha256 = "0rvav885cq7ia5kzwp7d37c2azsg47988z2fn6ksi1q6y294crxm"; })
+ (fetchNuGet { pname = "ThisAssembly.Prerequisites"; version = "1.0.9"; sha256 = "1igi76li4c1iif71141jhn7x5w0ng1vmqj5ijjhdxz289n6wjf2g"; })
+ (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; })
+ (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.3.4"; sha256 = "0w1bz5sr6y5fhgx1f54xyl8rx7y3kyf1fhacnd6akq8970zjdkdi"; })
+]
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 606a505885d9..1bacfb1315d5 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -303,6 +303,8 @@ let
# Intel GVT-g graphics virtualization supports 64-bit only
DRM_I915_GVT = whenAtLeast "4.16" yes;
DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module;
+ # Enable Hyper-V Synthetic DRM Driver
+ DRM_HYPERV = whenAtLeast "5.14" module;
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
# enable HDMI-CEC on RPi boards
DRM_VC4_HDMI_CEC = yes;
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 47cf03a3a87f..1a194421a6bc 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl }:
+{ lib, stdenv, fetchurl, buildPackages, linuxHeaders, perl, nixosTests }:
let
commonMakeFlags = [
@@ -9,11 +9,11 @@ in
stdenv.mkDerivation rec {
pname = "klibc";
- version = "2.0.10";
+ version = "2.0.11";
src = fetchurl {
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
- sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0=";
+ hash = "sha256-XrMOXh7HPcTjhMYLuUOvicUxdMgvh3Ev3TTdMoZNX2A=";
};
patches = [ ./no-reinstall-kernel-headers.patch ];
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
done
'';
+ passthru.tests = {
+ # uses klibc's ipconfig
+ inherit (nixosTests) initrd-network-ssh;
+ };
+
meta = {
description = "Minimalistic libc subset for initramfs usage";
homepage = "https://kernel.org/pub/linux/libs/klibc/";
diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
index 709dd30f8c7e..bf46a17f3d7d 100644
--- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
+++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
@@ -1,11 +1,12 @@
-diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.install
---- klibc-2.0.3-orig/scripts/Kbuild.install 2013-12-03 13:53:46.000000000 -0500
-+++ klibc-2.0.3/scripts/Kbuild.install 2014-01-04 18:17:09.342609021 -0500
-@@ -95,7 +95,6 @@
+diff --git a/scripts/Kbuild.install b/scripts/Kbuild.install
+index 0788637f..6708e19f 100644
+--- a/scripts/Kbuild.install
++++ b/scripts/Kbuild.install
+@@ -102,7 +102,6 @@ header:
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
- $(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
- $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
- $(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ ifneq ($(srctree),$(objtree))
+ $(Q)cp -rf $(srctree)/usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+ endif
diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix
index 9f295cf5197c..bcac0e37ffc0 100644
--- a/pkgs/servers/web-apps/bookstack/default.nix
+++ b/pkgs/servers/web-apps/bookstack/default.nix
@@ -16,13 +16,13 @@ let
in package.override rec {
pname = "bookstack";
- version = "22.06.2";
+ version = "22.11";
src = fetchFromGitHub {
owner = "bookstackapp";
repo = pname;
rev = "v${version}";
- sha256 = "17njpfmf5y4h59dvq30rrz1bda81kmbikxfmf7lm892x3vqc0vvx";
+ sha256 = "1k82dmlrq0ni9c4wf77d4jzrf24jxi1h5zfsj7132z4ql5di5gz4";
};
meta = with lib; {
diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix
index b4ec6bf6514b..24340a54e81e 100644
--- a/pkgs/servers/web-apps/bookstack/php-packages.nix
+++ b/pkgs/servers/web-apps/bookstack/php-packages.nix
@@ -15,10 +15,10 @@ let
"aws/aws-sdk-php" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "aws-aws-sdk-php-4ff51d01da43aa3bd36eef921a9cd4e0ff843fab";
+ name = "aws-aws-sdk-php-337e447997148b9e5024c2d0ae69618b1cbf80d6";
src = fetchurl {
- url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/4ff51d01da43aa3bd36eef921a9cd4e0ff843fab";
- sha256 = "0hja973aylbd5hhvxi0c3yrb0nr84xww73dcadwa25jnivln5mq7";
+ url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/337e447997148b9e5024c2d0ae69618b1cbf80d6";
+ sha256 = "1pwghj67zah616cvdrbs2fwgwn99jhxi95mdfq6l2jhpy59gymkc";
};
};
};
@@ -35,10 +35,10 @@ let
"barryvdh/laravel-dompdf" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "barryvdh-laravel-dompdf-de83130d029289e1b59f28b41c314ce1d157b4a0";
+ name = "barryvdh-laravel-dompdf-1d47648c6cef37f715ecb8bcc5f5a656ad372e27";
src = fetchurl {
- url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/de83130d029289e1b59f28b41c314ce1d157b4a0";
- sha256 = "19pv4zxvhka6war0w4s0wfqfjbnpq43qhkj1kxb3agh83ni6jrx0";
+ url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/1d47648c6cef37f715ecb8bcc5f5a656ad372e27";
+ sha256 = "0xvaq6mp9s8nxlpfisa50fr8rjb6vmivxdbr985q9vydadh1dsv2";
};
};
};
@@ -85,10 +85,10 @@ let
"doctrine/dbal" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "doctrine-dbal-9f79d4650430b582f4598fe0954ef4d52fbc0a8a";
+ name = "doctrine-dbal-f38ee8aaca2d58ee88653cb34a6a3880c23f38a5";
src = fetchurl {
- url = "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a";
- sha256 = "0jf1whbf0d5kizrlzdm29ld5lrk4fgmayr239vyl2dmdzzxyvkhf";
+ url = "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5";
+ sha256 = "09kv9g6693gr3i2wbfc1riyzgfkm5kkamhzfj4skrsw14pvacsgf";
};
};
};
@@ -105,20 +105,20 @@ let
"doctrine/event-manager" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f";
+ name = "doctrine-event-manager-95aa4cb529f1e96576f3fda9f5705ada4056a520";
src = fetchurl {
- url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f";
- sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8";
+ url = "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520";
+ sha256 = "0xi2s28jmmvrndg1yd0r5s10d9a0q6j2dxdbazvcbws9waf0yrvj";
};
};
};
"doctrine/inflector" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "doctrine-inflector-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89";
+ name = "doctrine-inflector-d9d313a36c872fd6ee06d9a6cbcf713eaa40f024";
src = fetchurl {
- url = "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89";
- sha256 = "1l83jbj4k59m1agi041gzx1rxix1wzxw9mvnivmg1hqr158149n7";
+ url = "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024";
+ sha256 = "1z6y0mxqadarw76whppcl0h0cj7p5n6k7mxihggavq46i2wf7nhj";
};
};
};
@@ -135,20 +135,20 @@ let
"dompdf/dompdf" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "dompdf-dompdf-5031045d9640b38cfc14aac9667470df09c9e090";
+ name = "dompdf-dompdf-c5310df0e22c758c85ea5288175fc6cd777bc085";
src = fetchurl {
- url = "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090";
- sha256 = "1ciw3mc6pq3rwpzsgc71gdbwppqjdfcr0fhq3435c27ni5y8z4c5";
+ url = "https://api.github.com/repos/dompdf/dompdf/zipball/c5310df0e22c758c85ea5288175fc6cd777bc085";
+ sha256 = "1h9y3v02qdijc6hmi7p8x626jlhkjd2pcck9mkcmm5sz9xzqhdwb";
};
};
};
"dragonmantank/cron-expression" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "dragonmantank-cron-expression-be85b3f05b46c39bbc0d95f6c071ddff669510fa";
+ name = "dragonmantank-cron-expression-782ca5968ab8b954773518e9e49a6f892a34b2a8";
src = fetchurl {
- url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa";
- sha256 = "09k5cj8bay6jkphjl5ngfx7qb17dxnlvpf6918a9ms8am731s2a6";
+ url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8";
+ sha256 = "18pxn1v3b2yhwzky22p4wn520h89rcrihl7l6hd0p769vk1b2qg9";
};
};
};
@@ -165,50 +165,50 @@ let
"filp/whoops" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "filp-whoops-a63e5e8f26ebbebf8ed3c5c691637325512eb0dc";
+ name = "filp-whoops-f7948baaa0330277c729714910336383286305da";
src = fetchurl {
- url = "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc";
- sha256 = "0hc9zfh3i7br30831grccm4wny9dllpswhaw8hdn988mvg5xrdy0";
+ url = "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da";
+ sha256 = "1l70lq27h072ria2pgmf9dp3h5awszirqd1khlcknl4w1hww3swv";
};
};
};
"graham-campbell/result-type" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "graham-campbell-result-type-0690bde05318336c7221785f2a932467f98b64ca";
+ name = "graham-campbell-result-type-a878d45c1914464426dc94da61c9e1d36ae262a8";
src = fetchurl {
- url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca";
- sha256 = "0a6kj3vxmhr1wh2kggmrl6y41hkg19jc0iq8qw095lf11mr4bd83";
+ url = "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8";
+ sha256 = "1xayas92b467yixpc79l7ydgspy3s76cpfddv7lrvd691y11g1vb";
};
};
};
"guzzlehttp/guzzle" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "guzzlehttp-guzzle-1dd98b0564cb3f6bd16ce683cb755f94c10fbd82";
+ name = "guzzlehttp-guzzle-b50a2a1251152e43f6a37f0fa053e730a67d25ba";
src = fetchurl {
- url = "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82";
- sha256 = "0a8491bb72y61r3ghqn32kabsj8rxhj9pddnkkr14x3wbc10zfr4";
+ url = "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba";
+ sha256 = "0cy828r0kafx58jh0k1cy17y77qh248d9kfk9ncn9pyq2q5v9p9p";
};
};
};
"guzzlehttp/promises" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "guzzlehttp-promises-fe752aedc9fd8fcca3fe7ad05d419d32998a06da";
+ name = "guzzlehttp-promises-b94b2807d85443f9719887892882d0329d1e2598";
src = fetchurl {
- url = "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da";
- sha256 = "09ivi77y49bpc2sy3xhvgq22rfh2fhv921mn8402dv0a8bdprf56";
+ url = "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598";
+ sha256 = "1vvac7y5ax955qjg7dyjmaw3vab9v2lypjygap0040rv3z4x9vz8";
};
};
};
"guzzlehttp/psr7" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "guzzlehttp-psr7-13388f00956b1503577598873fffb5ae994b5737";
+ name = "guzzlehttp-psr7-67c26b443f348a51926030c83481b85718457d3d";
src = fetchurl {
- url = "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737";
- sha256 = "05vc1q903nxfg11y9mcnlg253lm5d81jjg6wv76hjiwx8m47lbac";
+ url = "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d";
+ sha256 = "09avh5xzmzwfpa5xv9zw90ypyfrhpyhszbli395prgh3llnrx9wg";
};
};
};
@@ -235,50 +235,40 @@ let
"laravel/framework" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "laravel-framework-2cf142cd5100b02da248acad3988bdaba5635e16";
+ name = "laravel-framework-7411d9fa71c1b0fd73a33e225f14512b74e6c81e";
src = fetchurl {
- url = "https://api.github.com/repos/laravel/framework/zipball/2cf142cd5100b02da248acad3988bdaba5635e16";
- sha256 = "19n6ynj4cbpxx1h4y1np61i7mdahfbzfajly95w4zqss5bm67j73";
+ url = "https://api.github.com/repos/laravel/framework/zipball/7411d9fa71c1b0fd73a33e225f14512b74e6c81e";
+ sha256 = "0pdxr823p52cf284yfqwncii52g4zgk2gw5prn774h26v42dwaqw";
};
};
};
"laravel/serializable-closure" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "laravel-serializable-closure-09f0e9fb61829f628205b7c94906c28740ff9540";
+ name = "laravel-serializable-closure-47afb7fae28ed29057fdca37e16a84f90cc62fae";
src = fetchurl {
- url = "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540";
- sha256 = "1b0kdx0cs43ci4pyhhv874k5i0k42iiizz1mz0f6wk8lpzhk0r6r";
+ url = "https://api.github.com/repos/laravel/serializable-closure/zipball/47afb7fae28ed29057fdca37e16a84f90cc62fae";
+ sha256 = "1mfj1jszq1mssxfh68y3s43sq90bpj25a2kpj0djbmcrccgwd46z";
};
};
};
"laravel/socialite" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "laravel-socialite-68afb03259b82d898c68196cbcacd48596a9dd72";
+ name = "laravel-socialite-1cd1682b709b8808a5b5dbb68179a58d1342aa7b";
src = fetchurl {
- url = "https://api.github.com/repos/laravel/socialite/zipball/68afb03259b82d898c68196cbcacd48596a9dd72";
- sha256 = "0pp8wqbjvsdsh4x8nvafp0fz42iwaqbm4l7qf91q0c1jqqfqqx6r";
+ url = "https://api.github.com/repos/laravel/socialite/zipball/1cd1682b709b8808a5b5dbb68179a58d1342aa7b";
+ sha256 = "0h37rw9ndh56dh71d8jaxidpnyr7xs42nnim88aaxas304j7jdwa";
};
};
};
"laravel/tinker" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "laravel-tinker-dff39b661e827dae6e092412f976658df82dbac5";
+ name = "laravel-tinker-5062061b4924af3392225dd482ca7b4d85d8b8ef";
src = fetchurl {
- url = "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5";
- sha256 = "0az4n99pfrhrnr7diwi656f8y9qbynxzdw25md29ji8bw0isbc6d";
- };
- };
- };
- "laravel/ui" = {
- targetDir = "";
- src = composerEnv.buildZipPackage {
- name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c";
- src = fetchurl {
- url = "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c";
- sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm";
+ url = "https://api.github.com/repos/laravel/tinker/zipball/5062061b4924af3392225dd482ca7b4d85d8b8ef";
+ sha256 = "0smv55xbj6pk223v3nfd0fi5n4l8v85c4pra98ahq3615xma3k8c";
};
};
};
@@ -295,20 +285,20 @@ let
"league/flysystem" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "league-flysystem-094defdb4a7001845300334e7c1ee2335925ef99";
+ name = "league-flysystem-3239285c825c152bcc315fe0e87d6b55f5972ed1";
src = fetchurl {
- url = "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99";
- sha256 = "0dn71b1pwikbwz1cmmz9k1fc8k1fsmah3gy8sqxbz7czhqn5qiva";
+ url = "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1";
+ sha256 = "0p1cirl7j9b3gvbp264d08abfnrki89jr7rx0cbw0bjw1apf4spz";
};
};
};
"league/flysystem-aws-s3-v3" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972";
+ name = "league-flysystem-aws-s3-v3-af286f291ebab6877bac0c359c6c2cb017eb061d";
src = fetchurl {
- url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972";
- sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab";
+ url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d";
+ sha256 = "1dyj1cvf2pbvkdw9i53qg6lycxv0di85qnjzcvy5lphrxambifxy";
};
};
};
@@ -352,13 +342,23 @@ let
};
};
};
+ "masterminds/html5" = {
+ targetDir = "";
+ src = composerEnv.buildZipPackage {
+ name = "masterminds-html5-897eb517a343a2281f11bc5556d6548db7d93947";
+ src = fetchurl {
+ url = "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947";
+ sha256 = "12fmcgsrmh0f0llnpcvk33mrs4067nw246ci5619rr79ijy3yc0k";
+ };
+ };
+ };
"monolog/monolog" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "monolog-monolog-5579edf28aee1190a798bfa5be8bc16c563bd524";
+ name = "monolog-monolog-720488632c590286b88b80e62aa3d3d551ad4a50";
src = fetchurl {
- url = "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524";
- sha256 = "014sys8bv57jbpag7xlc7vplc1qy4h5jppy258hpr0xfbh27cg3w";
+ url = "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50";
+ sha256 = "0wg1y0mghhib6cp9gcavbs6ajfs9rgxc2ssipqb5yfwfkkbwrif6";
};
};
};
@@ -375,30 +375,30 @@ let
"nesbot/carbon" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "nesbot-carbon-97a34af22bde8d0ac20ab34b29d7bfe360902055";
+ name = "nesbot-carbon-ad35dd71a6a212b98e4b87e97389b6fa85f0e347";
src = fetchurl {
- url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055";
- sha256 = "0dagm5dr9pbyvxhmspdwmpwgnxf65mjk24a32cw8h5wqfn0p99i8";
+ url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad35dd71a6a212b98e4b87e97389b6fa85f0e347";
+ sha256 = "1a7qlk82jfxnf84v4vwwgs9b325mb07whkc5vxrqjjjp8krncxbi";
};
};
};
"nikic/php-parser" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "nikic-php-parser-34bea19b6e03d8153165d8f30bba4c3be86184c1";
+ name = "nikic-php-parser-f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc";
src = fetchurl {
- url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1";
- sha256 = "1yj97j9cdx48566qwjl5q8hkjkrd1xl59aczb1scspxay37l9w72";
+ url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc";
+ sha256 = "0lsw925jy1y1vvsx5da6abn1ky7g6whaxx9g524jgqgbaljrjhxm";
};
};
};
"onelogin/php-saml" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "onelogin-php-saml-247a45c079e65a78185d5489bdda0f95826c014d";
+ name = "onelogin-php-saml-b22a57ebd13e838b90df5d3346090bc37056409d";
src = fetchurl {
- url = "https://api.github.com/repos/onelogin/php-saml/zipball/247a45c079e65a78185d5489bdda0f95826c014d";
- sha256 = "1hmv63ba9164khnwmrrl0m8n0zjl729afp5nsvl8nz7frharilb4";
+ url = "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d";
+ sha256 = "1bi65bi04a26zmaz7ms0qyg6i86k4cd9g8qs7dp1pphpvflgz461";
};
};
};
@@ -445,30 +445,30 @@ let
"phenx/php-svg-lib" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "phenx-php-svg-lib-4498b5df7b08e8469f0f8279651ea5de9626ed02";
+ name = "phenx-php-svg-lib-76876c6cf3080bcb6f249d7d59705108166a6685";
src = fetchurl {
- url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02";
- sha256 = "01w65haq96sfyjl8ahm9nb95wasgl66ymv5lycx1cbagy653xdin";
+ url = "https://api.github.com/repos/dompdf/php-svg-lib/zipball/76876c6cf3080bcb6f249d7d59705108166a6685";
+ sha256 = "0bjynrs81das9f9jwd5jgsxx9gjv2m6c0mkvlgx4w1f4pgbvwsf5";
};
};
};
"phpoption/phpoption" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "phpoption-phpoption-eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15";
+ name = "phpoption-phpoption-dc5ff11e274a90cc1c743f66c9ad700ce50db9ab";
src = fetchurl {
- url = "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15";
- sha256 = "1lk50y8jj2mzbwc2mxfm2xdasxf4axya72nv8wfc1vyz9y5ys3li";
+ url = "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab";
+ sha256 = "12i9gc2q75iv6c0x87zj3j499pl8k0wzh3yzvgrhg97nhbdhab5c";
};
};
};
"phpseclib/phpseclib" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "phpseclib-phpseclib-2f0b7af658cbea265cbb4a791d6c29a6613f98ef";
+ name = "phpseclib-phpseclib-dbc2307d5c69aeb22db136c52e91130d7f2ca761";
src = fetchurl {
- url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef";
- sha256 = "08azglzhm6j821p5w3nb61ny7gz4lgj5kdmr1f1h723f8sjjwmfs";
+ url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761";
+ sha256 = "1xpb0wi54rg33w7w357l6vh1kg9yh0pwabhmf8r9ih35s05n58a9";
};
};
};
@@ -575,10 +575,10 @@ let
"psy/psysh" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "psy-psysh-c23686f9c48ca202710dbb967df8385a952a2daf";
+ name = "psy-psysh-1acec99d6684a54ff92f8b548a4e41b566963778";
src = fetchurl {
- url = "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf";
- sha256 = "1qjqb3x1sgqz9m6ckzgsymdgwqkd9kf8zv6wy5xiwhaxvqv4f0i7";
+ url = "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778";
+ sha256 = "169v5160qhq07n3mvhifrgvjqrbm0306nn2ibiqwrcfqyyhq43z0";
};
};
};
@@ -655,10 +655,10 @@ let
"socialiteproviders/manager" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "socialiteproviders-manager-4e63afbd26dc45ff263591de2a0970436a6a0bf9";
+ name = "socialiteproviders-manager-738276dfbc2b68a9145db7b3df1588d53db528a1";
src = fetchurl {
- url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/4e63afbd26dc45ff263591de2a0970436a6a0bf9";
- sha256 = "1056ilack76b0zsqv7i1znidg5nyd9iznvznh5x7vsryspjvx358";
+ url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/738276dfbc2b68a9145db7b3df1588d53db528a1";
+ sha256 = "0d7ayh72cdxkslmgdgj0d6rkqghyhbdhdhkiz9064virm7fa5ii0";
};
};
};
@@ -725,20 +725,20 @@ let
"symfony/console" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-console-829d5d1bf60b2efeb0887b7436873becc71a45eb";
+ name = "symfony-console-ea59bb0edfaf9f28d18d8791410ee0355f317669";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb";
- sha256 = "1mvlkvs7xq6l1lb6cgwy8j3avfhgx6aiz70ln6i6vaap7yhr3zh5";
+ url = "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669";
+ sha256 = "1qvr9av4c9kac5q2lpwiwq269rq5pxdvnvb32asysifw30zd5j3d";
};
};
};
"symfony/css-selector" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-css-selector-b0a190285cd95cb019237851205b8140ef6e368e";
+ name = "symfony-css-selector-c1681789f059ab756001052164726ae88512ae3d";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e";
- sha256 = "1wpxfb7xcn7sjpcgz45582wxymq9d089a71mz80kmwrlblcvxq99";
+ url = "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d";
+ sha256 = "1v1kpfqc4njdpqqa668vkz7mqxsklzbsf62pcgdvkbg724ck4zis";
};
};
};
@@ -755,10 +755,10 @@ let
"symfony/error-handler" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-error-handler-c116cda1f51c678782768dce89a45f13c949455d";
+ name = "symfony-error-handler-539cf1428b8442303c6e876ad7bf5a7babd91091";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d";
- sha256 = "16bvys7dkhja7bjf42k7rxd7d96fbsp1aj3n50a6b6fj3q2jkxwm";
+ url = "https://api.github.com/repos/symfony/error-handler/zipball/539cf1428b8442303c6e876ad7bf5a7babd91091";
+ sha256 = "0x2r3kpip9cmdn5d47isamyas13sl43y50wfk23zwj5vh70qgh5s";
};
};
};
@@ -785,230 +785,230 @@ let
"symfony/finder" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-finder-9b630f3427f3ebe7cd346c277a1408b00249dad9";
+ name = "symfony-finder-7872a66f57caffa2916a584db1aa7f12adc76f8c";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9";
- sha256 = "0b2rdx4080jav1ixqxrl4mabn91amf81xsj533b067vdfq4rcfv4";
+ url = "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c";
+ sha256 = "111qy05azqwj14v0k034lwd970slx081x56pnicyxsbg3yc9wmnp";
};
};
};
"symfony/http-foundation" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-http-foundation-6b0d0e4aca38d57605dcd11e2416994b38774522";
+ name = "symfony-http-foundation-75bd663ff2db90141bfb733682459d5bbe9e29c3";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522";
- sha256 = "0633r4dx8xrbllqxfxl9fhfr32qak5wx8p2zysb3g9yqp0saf4gb";
+ url = "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3";
+ sha256 = "195w56aicv57nmcwsai6jklicb9qqak4imk4xwsgc3i98yw3md2w";
};
};
};
"symfony/http-kernel" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-http-kernel-34b121ad3dc761f35fe1346d2f15618f8cbf77f8";
+ name = "symfony-http-kernel-fc63c8c3e1036d424820cc993a4ea163778dc5c7";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/http-kernel/zipball/34b121ad3dc761f35fe1346d2f15618f8cbf77f8";
- sha256 = "02x5ym8p9mjn7j69a85nkg50685m9kq6xwhnzpydbn28w3rwksdv";
+ url = "https://api.github.com/repos/symfony/http-kernel/zipball/fc63c8c3e1036d424820cc993a4ea163778dc5c7";
+ sha256 = "0z1cg1ac1r00c0i5apvk8rrglwswcy6gx9w9v5kmk7ajijnk583m";
};
};
};
"symfony/mime" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-mime-2b3802a24e48d0cfccf885173d2aac91e73df92e";
+ name = "symfony-mime-1c118b253bb3495d81e95a6e3ec6c2766a98a0c4";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e";
- sha256 = "0qsfkx1md5xkvq5cxkj3qggmk5ykcsdm6i9553p9r14iqpxhnkqg";
+ url = "https://api.github.com/repos/symfony/mime/zipball/1c118b253bb3495d81e95a6e3ec6c2766a98a0c4";
+ sha256 = "1r06lijy4zbqppyfnvnq2arbjn0dwzb1d14lcy5wsbh3k3bgpsvq";
};
};
};
"symfony/polyfill-ctype" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-ctype-6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4";
+ name = "symfony-polyfill-ctype-5bbc823adecdae860bb64756d639ecfec17b050a";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4";
- sha256 = "18235xiqpjx9nzx3pzylm5yzqr6n1j8wnnrzgab1hpbvixfrbqba";
+ url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a";
+ sha256 = "0vyv70z1yi2is727d1mkb961w5r1pb1v3wy1pvdp30h8ffy15wk6";
};
};
};
"symfony/polyfill-iconv" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-iconv-143f1881e655bebca1312722af8068de235ae5dc";
+ name = "symfony-polyfill-iconv-927013f3aac555983a5059aada98e1907d842695";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc";
- sha256 = "19v4r40vx62a181l6zfs7n40w9f7npy7jw5x6dssg40hl4a0i3p2";
+ url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695";
+ sha256 = "1qmnzd3r2l35rx84r8ai0596dywsj7q5y3dngaf1vsz16k5ig409";
};
};
};
"symfony/polyfill-intl-grapheme" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-intl-grapheme-433d05519ce6990bf3530fba6957499d327395c2";
+ name = "symfony-polyfill-intl-grapheme-511a08c03c1960e08a883f4cffcacd219b758354";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2";
- sha256 = "11169jh39mhr591b61iara8hvq4pnfzgkynlqg90iv510c74d1cg";
+ url = "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354";
+ sha256 = "0ifsgsyxf0z0nkynqvr5259dm5dsmbgdpvyi5zfvy8935mi0ki0i";
};
};
};
"symfony/polyfill-intl-idn" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-intl-idn-59a8d271f00dd0e4c2e518104cc7963f655a1aa8";
+ name = "symfony-polyfill-intl-idn-639084e360537a19f9ee352433b84ce831f3d2da";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8";
- sha256 = "1bcdl48ji0dmswwvw2b66qxdxxawbx8bgicc02la92gacps08n5v";
+ url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da";
+ sha256 = "1i2wcsbfbwdyrx8545yrrvbdaf4l2393pjvg9266q74611j6pzxj";
};
};
};
"symfony/polyfill-intl-normalizer" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-intl-normalizer-219aa369ceff116e673852dce47c3a41794c14bd";
+ name = "symfony-polyfill-intl-normalizer-19bd1e4fcd5b91116f14d8533c57831ed00571b6";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd";
- sha256 = "1cwckrazq4p4i9ysjh8wjqw8qfnp0rx48pkwysch6z7vkgcif22w";
+ url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6";
+ sha256 = "1d80jph5ykiw6ydv8fwd43s0aglh24qc1yrzds2f3aqanpbk1gr2";
};
};
};
"symfony/polyfill-mbstring" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-mbstring-9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e";
+ name = "symfony-polyfill-mbstring-8ad114f6b39e2c98a8b0e3bd907732c207c2b534";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e";
- sha256 = "0y289x91c9lgr8vlixj5blayf9lsgi4nn2gyn3a99brvn2jnh6q8";
+ url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534";
+ sha256 = "1ym84qp609i50lv4vkd4yz99y19kaxd5kmpdnh66mxx1a4a104mi";
};
};
};
"symfony/polyfill-php72" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-php72-bf44a9fd41feaac72b074de600314a93e2ae78e2";
+ name = "symfony-polyfill-php72-869329b1e9894268a8a61dabb69153029b7a8c97";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2";
- sha256 = "11knb688wcf8yvrprgp4z02z3nb6s5xj3wrv77n2qjkc7nc8q7l7";
+ url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97";
+ sha256 = "1h0lbh8d41sa4fymmw03yzws3v3z0lz4lv1kgcld7r53i2m3wfwp";
};
};
};
"symfony/polyfill-php73" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-php73-e440d35fa0286f77fb45b79a03fedbeda9307e85";
+ name = "symfony-polyfill-php73-9e8ecb5f92152187c4799efd3c96b78ccab18ff9";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85";
- sha256 = "1c7w7j375a1fxq5m4ldy72jg5x4dpijs8q9ryqxvd6gmj1lvncqy";
+ url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9";
+ sha256 = "1p0jr92x323pl4frjbhmziyk5g1zig1g30i1v1p0wfli2sq8h5mb";
};
};
};
"symfony/polyfill-php80" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-php80-cfa0ae98841b9e461207c13ab093d76b0fa7bace";
+ name = "symfony-polyfill-php80-7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace";
- sha256 = "1kbh4j01kxxc39ls9kzkg7dj13cdlzwy599b96harisysn47jw2n";
+ url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936";
+ sha256 = "16yydk7rsknlasrpn47n4b4js8svvp4rxzw99dkav52wr3cqmcwd";
};
};
};
"symfony/polyfill-php81" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-polyfill-php81-13f6d1271c663dc5ae9fb843a8f16521db7687a1";
+ name = "symfony-polyfill-php81-707403074c8ea6e2edaf8794b0157a0bfa52157a";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1";
- sha256 = "01dqzkdppaw7kh1vkckkzn54aql4iw6m9vyg99ahhzmqc2krs91x";
+ url = "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a";
+ sha256 = "05qrjfnnnz402l11wm0ydblrip7hjll12yqxmh2wd02b0s8dj29f";
};
};
};
"symfony/process" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-process-597f3fff8e3e91836bb0bd38f5718b56ddbde2f3";
+ name = "symfony-process-6e75fe6874cbc7e4773d049616ab450eff537bf1";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3";
- sha256 = "1vv2xwk3cvr144yxjj6k4afhkv50v2b957lscncs6m3rvi2zs1nk";
+ url = "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1";
+ sha256 = "0jzymj7jh9zm376p3ydq6adid9cxd8fmmk2hdnyjk30chsb37yfw";
};
};
};
"symfony/routing" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-routing-e07817bb6244ea33ef5ad31abc4a9288bef3f2f7";
+ name = "symfony-routing-5c9b129efe9abce9470e384bf65d8a7e262eee69";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7";
- sha256 = "1lk7dbcxvfwmyx65hm0v78ma79f67jnq2xnzg6k0wz52161rk6cl";
+ url = "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69";
+ sha256 = "0pa3zqqsa9jf362zdhg8jhppv1z7nnj6hq65dym473p1c3zwyfxb";
};
};
};
"symfony/service-contracts" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-service-contracts-24d9dc654b83e91aa59f9d167b131bc3b5bea24c";
+ name = "symfony-service-contracts-4b426aac47d6427cc1a1d0f7e2ac724627f5966c";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c";
- sha256 = "1flrnq7dw7rg8b901fbi7gv6k25hqbhffpd15w751fmzsrpzaphl";
+ url = "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c";
+ sha256 = "0lh0vxy0h4wsjmnlf42s950bicsvkzz6brqikfnfb5kmvi0xhcm6";
};
};
};
"symfony/string" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-string-985e6a9703ef5ce32ba617c9c7d97873bb7b2a99";
+ name = "symfony-string-571334ce9f687e3e6af72db4d3b2a9431e4fd9ed";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99";
- sha256 = "0hjkz8bb95ibp2am8i84b7ijh48llip613l0cc8i5fg5q12b20sn";
+ url = "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed";
+ sha256 = "1hwji8pwsfb79sdrigbisxs0cjnhs1qbm6rrflhqyhpviwvbhyqx";
};
};
};
"symfony/translation" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-translation-1639abc1177d26bcd4320e535e664cef067ab0ca";
+ name = "symfony-translation-f0ed07675863aa6e3939df8b1bc879450b585cab";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca";
- sha256 = "0q7f4hfv8n7px5fhh0f8ii6lbfj9xp7fas5ls7yazm4980c06a1x";
+ url = "https://api.github.com/repos/symfony/translation/zipball/f0ed07675863aa6e3939df8b1bc879450b585cab";
+ sha256 = "0a6y9glxjaiflprlr3fk8qgjdhqmqzjf912pq1qbn0lmc7f0y8pr";
};
};
};
"symfony/translation-contracts" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-translation-contracts-1211df0afa701e45a04253110e959d4af4ef0f07";
+ name = "symfony-translation-contracts-136b19dd05cdf0709db6537d058bcab6dd6e2dbe";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07";
- sha256 = "09d057ycwa7l34ph32agkcbam8jwpxh6fr1ay17xf9haczlgs1ad";
+ url = "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe";
+ sha256 = "1z1514i3gsxdisyayzh880i8rj954qim7c183cld91kvvqcqi7x0";
};
};
};
"symfony/var-dumper" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "symfony-var-dumper-af52239a330fafd192c773795520dc2dd62b5657";
+ name = "symfony-var-dumper-6894d06145fefebd9a4c7272baa026a1c394a430";
src = fetchurl {
- url = "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657";
- sha256 = "1dxmwyg3wxq313zfrjwywkfsi38lq6i3prq69f47vbiqajfs55jn";
+ url = "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430";
+ sha256 = "055s38szlhpxrhv1kjawsm5rwh6dr7drk9jpyj6a5r0g4jn63m72";
};
};
};
"tijsverkoyen/css-to-inline-styles" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "tijsverkoyen-css-to-inline-styles-da444caae6aca7a19c0c140f68c6182e337d5b1c";
+ name = "tijsverkoyen-css-to-inline-styles-4348a3a06651827a27d989ad1d13efec6bb49b19";
src = fetchurl {
- url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c";
- sha256 = "13lzhf1kswg626b8zd23z4pa7sg679si368wcg6pklqvijnn0any";
+ url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/4348a3a06651827a27d989ad1d13efec6bb49b19";
+ sha256 = "0fs2w9hw0drf1hszidrmplrph7ay8m8pv58pqv26v0228m4l6vlm";
};
};
};
"vlucas/phpdotenv" = {
targetDir = "";
src = composerEnv.buildZipPackage {
- name = "vlucas-phpdotenv-264dce589e7ce37a7ba99cb901eed8249fbec92f";
+ name = "vlucas-phpdotenv-1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7";
src = fetchurl {
- url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f";
- sha256 = "0z2q376k3rww8qb9jdywm3fj386pqmcx7rg6msd3zdrjxfbqcqnl";
+ url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7";
+ sha256 = "13h4xyxhdjn1n7xcxbcdhj20rv5fsaigbsbz61x2i224hj76620a";
};
};
};
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 7e177a1744cd..782c2fb2bea3 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -44,6 +44,16 @@ stdenv.mkDerivation {
"--enable-pcre"
"--enable-zprofile=${placeholder "out"}/etc/zprofile"
"--disable-site-fndir"
+ ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [
+ # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba
+ "zsh_cv_shared_environ=yes"
+ "zsh_cv_shared_tgetent=yes"
+ "zsh_cv_shared_tigetstr=yes"
+ "zsh_cv_sys_dynamic_clash_ok=yes"
+ "zsh_cv_sys_dynamic_rtld_global=yes"
+ "zsh_cv_sys_dynamic_execsyms=yes"
+ "zsh_cv_sys_dynamic_strip_exe=yes"
+ "zsh_cv_sys_dynamic_strip_lib=yes"
];
# the zsh/zpty module is not available on hydra
diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix
index 6af5fe7cc66c..f9e5633476ab 100644
--- a/pkgs/shells/zsh/zsh-git-prompt/default.nix
+++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix
@@ -25,7 +25,7 @@
# installed.
#
{ fetchFromGitHub
-, python2
+, python3
, git
, lib
, haskellPackages
@@ -45,7 +45,7 @@ haskellPackages.callPackage
prePatch = ''
substituteInPlace zshrc.sh \
--replace ':-"python"' ':-"haskell"' \
- --replace 'python ' '${python2.interpreter} ' \
+ --replace 'python ' '${python3.interpreter} ' \
--replace 'git ' '${git}/bin/git '
'';
preCompileBuildDriver = "cd src";
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
index e28d4f8b9c7e..6f9c7a656d1b 100644
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/pkgs/tools/cd-dvd/cdrkit/default.nix
@@ -13,10 +13,16 @@ stdenv.mkDerivation rec {
buildInputs = [ libcap zlib bzip2 perl ];
hardeningDisable = [ "format" ];
+ NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isMusl "-D__THROW=";
# efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244
patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ];
+ preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
+ substituteInPlace include/xconfig.h.in \
+ --replace "#define HAVE_RCMD 1" "#undef HAVE_RCMD"
+ '';
+
postInstall = ''
# file name compatibility with the old cdrecord (growisofs wants this name)
ln -s $out/bin/genisoimage $out/bin/mkisofs
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index ce066ed7c07a..9539e7293fae 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "cmst";
- version = "2022.05.01";
+ version = "2022.11.30";
src = fetchFromGitHub {
repo = "cmst";
owner = "andrew-bibb";
rev = "${pname}-${version}";
- sha256 = "sha256-d3uvJf1tI9vXyq1eIbHkKrinBuPkYoBUcusHsJmSqMA=";
+ sha256 = "sha256-4zrV+VPtzMVaNjY/t1Fix0bODRMgtC3t+kFM1meNzlA=";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 3660b8610af6..57e75462e3a6 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -4,7 +4,7 @@ with lib;
buildGoModule rec {
pname = "flannel";
- version = "0.20.1";
+ version = "0.20.2";
rev = "v${version}";
vendorSha256 = null;
@@ -13,7 +13,7 @@ buildGoModule rec {
inherit rev;
owner = "flannel-io";
repo = "flannel";
- sha256 = "sha256-0DRHUT2kXHQMnIEGHwzF70Gr3eP+Zg3rvAGtYyqtzLo=";
+ sha256 = "sha256-kuYW73orgtJsz+PC9Cr7XAtfFxiUSi42Sn6iMbwX0HA=";
};
ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];
diff --git a/pkgs/tools/package-management/appimage-run/test.nix b/pkgs/tools/package-management/appimage-run/test.nix
index c9bc63c08a8e..34c5ab777268 100644
--- a/pkgs/tools/package-management/appimage-run/test.nix
+++ b/pkgs/tools/package-management/appimage-run/test.nix
@@ -5,6 +5,10 @@ let
url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage";
sha256 = "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r";
};
+ owdtest = fetchurl {
+ url = "https://github.com/NixOS/nixpkgs/files/10099048/owdtest.AppImage.gz";
+ sha256 = "sha256-EEp9dxz/+l5XkNaVBFgv5v64sizQILnljRAzwXv/yV8=";
+ };
in
runCommand "appimage-run-tests" {
buildInputs = [ appimage-run glibcLocales file ];
@@ -18,6 +22,9 @@ in
# regression test for #108426
cp ${sample-appImage} foo.appImage
LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage
+ cp ${owdtest} owdtest.AppImage.gz
+ gunzip owdtest.AppImage.gz
+ appimage-run owdtest.AppImage
set +x
touch $out
''
diff --git a/pkgs/tools/system/dfrs/default.nix b/pkgs/tools/system/dfrs/default.nix
new file mode 100644
index 000000000000..f9bbbd12388f
--- /dev/null
+++ b/pkgs/tools/system/dfrs/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "dfrs";
+ version = "0.0.7";
+
+ src = fetchFromGitHub {
+ owner = "anthraxx";
+ repo = pname;
+ rev = version;
+ sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk";
+ };
+
+ cargoSha256 = "1dgmn4g35yc7hwnxznkrpwnikn329nc0z8y7bxlcd308k1v83919";
+
+ meta = with lib; {
+ description = "Display file system space usage using graphs and colors";
+ homepage = "https://github.com/anthraxx/dfrs";
+ license = licenses.mit;
+ maintainers = with maintainers; [ wamserma ];
+ };
+}
diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix
index 75f23051c6ea..bb03399f55fb 100644
--- a/pkgs/tools/wayland/wob/default.nix
+++ b/pkgs/tools/wayland/wob/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, inih
, meson
, ninja
, pkg-config
@@ -13,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "wob";
- version = "0.13";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "francma";
repo = pname;
rev = version;
- sha256 = "sha256-CXRBNnnhNV5LBIasVtmGrRG4ZXFGC7qNInU7Y0QsHbs=";
+ sha256 = "sha256-u4jLVLGcMTgDEgN8jW5d59m3GorJX7Z6+qKhzvbON3k=";
};
strictDeps = true;
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
pkg-config
];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
- buildInputs = [ wayland wayland-protocols ]
+ buildInputs = [ inih wayland wayland-protocols ]
++ lib.optional stdenv.isLinux libseccomp;
mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f4f0589fb29..21e01e43efe9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3468,6 +3468,8 @@ with pkgs;
beats = callPackage ../tools/misc/beats { };
+ BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { };
+
beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
inherit (plasma5Packages) breeze-icons;
};
@@ -6260,6 +6262,8 @@ with pkgs;
dfc = callPackage ../tools/system/dfc { };
+ dfrs = callPackage ../tools/system/dfrs { };
+
dev86 = callPackage ../development/compilers/dev86 { };
diskrsync = callPackage ../tools/backup/diskrsync { };
@@ -9872,6 +9876,8 @@ with pkgs;
pwsafe = callPackage ../applications/misc/pwsafe { };
+ pw-viz = callPackage ../applications/misc/pw-viz { };
+
napi-rs-cli = callPackage ../development/tools/napi-rs-cli { };
neil = callPackage ../development/tools/neil { };
@@ -12246,6 +12252,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
};
+ topiary = callPackage ../development/tools/misc/topiary { };
+
todo = callPackage ../tools/misc/todo { };
tor = callPackage ../tools/security/tor { };
@@ -19985,7 +19993,9 @@ with pkgs;
lmdbxx = callPackage ../development/libraries/lmdbxx { };
- lemon-graph = callPackage ../development/libraries/lemon-graph { };
+ lemon-graph = callPackage ../development/libraries/lemon-graph {
+ stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv;
+ };
levmar = callPackage ../development/libraries/levmar { };
@@ -35927,14 +35937,14 @@ with pkgs;
isabelle = callPackage ../applications/science/logic/isabelle {
polyml = polyml.overrideAttrs (_: {
pname = "polyml-for-isabelle";
- version = "2021-1";
+ version = "2022";
configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ];
buildFlags = [ "compiler" ];
src = fetchFromGitHub {
owner = "polyml";
repo = "polyml";
- rev = "39d96a2def903ed019c6855e3b688df5070d633a";
- sha256 = "sha256-S7d2Vr/nB+rCX9d4qQj4f7edVZKocKIjc5rrx9A/B4Q=";
+ rev = "bafe319bc3a65bf63bd98a4721a6f4dd9e0eabd6";
+ sha256 = "1ygs09zzq8icq1gc8qf4sb24lxx7sbcyd5hw3vw67a3ryaki0qw2";
};
});
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index d1dce8ee80a4..5ec56f28527b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -83,6 +83,7 @@ mapAliases ({
flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
flask_testing = flask-testing; # added 2022-04-25
flask_wtf = flask-wtf; # added 2022-05-24
+ functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
garminconnect-ha = garminconnect; # added 2022-02-05
gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d82c8bc5f572..dd9817e84073 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3542,8 +3542,6 @@ self: super: with self; {
functools32 = callPackage ../development/python-modules/functools32 { };
- functorch = callPackage ../development/python-modules/functorch { };
-
funcy = callPackage ../development/python-modules/funcy { };
furl = callPackage ../development/python-modules/furl { };