diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 8226fc614bc4..126e0902d5b4 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -282,8 +282,9 @@ in environment.systemPackages = [ cfg.package ]; environment.variables.IPFS_PATH = fakeKuboRepo; - # https://github.com/lucas-clemente/quic-go/wiki/UDP-Receive-Buffer-Size + # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000; + boot.kernel.sysctl."net.core.wmem_max" = mkDefault 2500000; programs.fuse = mkIf cfg.autoMount { userAllowOther = true; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eeb00b2103e8..2655acbb8c09 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -436,13 +436,13 @@ "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" }, "gandi": { - "hash": "sha256-8heDWScvmqUStu8Hq08wvcmEiI6Ym3tb3yCjHMgsDis=", + "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", "homepage": "https://registry.terraform.io/providers/go-gandi/gandi", "owner": "go-gandi", "repo": "terraform-provider-gandi", - "rev": "v2.2.4", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" + "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { "hash": "sha256-VBKjk8dimVBLyuhCMTGE6oH7zdiBAzAERzm85YZ4Gkg=", @@ -454,33 +454,33 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-IzZN7W1nfByUco4LG0AutSAVRHpeAnaHNmu6tpvHyQk=", + "hash": "sha256-J7jjGlvdxdAfbvSuekVaDTOZbY3MhxvLQMxGFH6LKEQ=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.6.0", + "rev": "v16.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-TMLLsOquMpkeAqS8hLI963hQ6t9n2fyx4XjtB+7oR2E=" + "vendorHash": "sha256-X+8WUPVpP27wWeWM1DA8P3fOToK791mtO6/grKyxcXg=" }, "google": { - "hash": "sha256-ISZC6jMxQ3f/TKsjMkG7uL260XXLdZEQauoEQUNY5eY=", + "hash": "sha256-ZlU2ifri8yM6oUwS1tVmHkTbZfdcei7M0aaX8d4o4NE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v5.10.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Bk4NxA/je67lre74KkKz4eT9fgmut3Crho8z/l1xEBY=" + "vendorHash": "sha256-N/FsxRGQu7GQG54oUO4TYiBFjRSZaU1vxBidC56D7m8=" }, "google-beta": { - "hash": "sha256-roAdaihEy3OHaAG0qP6Puliqj97jvphwNr0lmKYY1Tg=", + "hash": "sha256-VZmoIR4yDh3uaaE9DOt6B04IIxsqla+dFWWXbU2qW1c=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v5.10.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Bk4NxA/je67lre74KkKz4eT9fgmut3Crho8z/l1xEBY=" + "vendorHash": "sha256-N/FsxRGQu7GQG54oUO4TYiBFjRSZaU1vxBidC56D7m8=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -492,13 +492,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-3Sq+08URFntRO4uF3VFo49vrdvD1Vb+nG7V4a0IHlu0=", + "hash": "sha256-6A7+9LuKq7XvP65XB00wTKfbY0cXbGR2puVP3qMSVfA=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.8.0", + "rev": "v2.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-uhvk1TcnT8PNV2oHJy+rM+Z+WuKgl0rGoNypEWn7ddA=" + "vendorHash": "sha256-FhpuE01EcxnZALAeMvSBxKmgJRNiJvQg6+WVKCI3Cek=" }, "gridscale": { "hash": "sha256-nOuckOEiHTMUOSjRwTHaitLOosraEl2mbU4gafi3gi4=", @@ -655,13 +655,13 @@ "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" }, "keycloak": { - "hash": "sha256-itnXalLx5Bku7sxM5wKJs2vCvDeJnhR1bQ55ye1tpKs=", + "hash": "sha256-2Z7nQ5NKS18OtoXXLm/P1n64NAxLR8nfMGyS2y17lag=", "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak", "owner": "mrparkers", "repo": "terraform-provider-keycloak", - "rev": "v4.3.1", + "rev": "v4.4.0", "spdx": "MIT", - "vendorHash": "sha256-GhmawLENmRuG5ZbXEZAw8pYmHn2SN2ONzfSIVEyN4U4=" + "vendorHash": "sha256-F78OR8EG0Vy3WVJWTOlAsIBazsSXGD6KeceYuGnBqjQ=" }, "kubectl": { "hash": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", @@ -673,11 +673,11 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-kB91X+IkBtOJ28CopNMU0G6MHRNUZ8d0VgiO7JTneGo=", + "hash": "sha256-1MPVP9DTC5pIe5rzO/N3hcN8De+PMH/1WDiq5e1GRtA=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.25.1", + "rev": "v2.25.2", "spdx": "MPL-2.0", "vendorHash": "sha256-1EpDTVVxmz4icLClRlJQiy2kZpZMHR9f9rAoFaZ25XY=" }, @@ -700,13 +700,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-nuTQdZdkLc+AX69m26a6Cjt0HJEFo+Vvd5TH3qDMxBk=", + "hash": "sha256-AGRSwQ96CNvP1QXcUW34+B6yZLhjb9Yfu/DQWM9UdkQ=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.12.0", + "rev": "v2.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hbGilQWhlme1URDz2idjYMq1oAYiI4JIvs/n/+W1lEU=" + "vendorHash": "sha256-wCQ/qbM382HgN+AT4nmt0Bn8iZrmsd+ln+kkp5/4kqs=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -917,11 +917,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-s8Tg1j47J0sj9Jt98mS4rFgtGl4uFIfdaQDNXOV8Bbg=", + "hash": "sha256-TJ5PIRBgiJYT/JsWgHUXdRyaTdkO4ORHj5YDyyvt+tk=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.35.0", + "rev": "v0.36.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -935,13 +935,13 @@ "vendorHash": null }, "pass": { - "hash": "sha256-QGcHOsyUINH4bqK14OEzNm4b7oMK/4hwN9SuKt4m6t8=", + "hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=", "homepage": "https://registry.terraform.io/providers/camptocamp/pass", "owner": "camptocamp", "repo": "terraform-provider-pass", - "rev": "v2.1.0", + "rev": "v2.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LWyfkhyTr6xHtt8nCdqid/zKwGerYVxSEpqSe853S9w=" + "vendorHash": "sha256-Koojva0MAw5WC942VbxZ6d1Pf1VwFvJMmp16TsHRS3w=" }, "porkbun": { "hash": "sha256-YWUccesHNy8mdP5iWtXP1macOLGRKqqla6dWGYihJAo=", diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index e519b817e142..d2509990ff60 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.10.3"; + version = "5.10.4"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-AnaW/zH2Vng8lpzv6LHlzCUnNWJoLpsSpmD0iZfteFg="; + hash = "sha256-M4h+kV4JjZ91K6OpxKc10XVohzKJEVxw8cYcVALibXA="; name="${pname}-${version}.AppImage"; }; @@ -37,5 +37,6 @@ in appimageTools.wrapType2 { license = licenses.asl20; maintainers = with maintainers; [ andersk jonafato ]; platforms = [ "x86_64-linux" ]; + mainProgram = "zulip"; }; } diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 6485681e3313..77e5919c0eee 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -1,29 +1,39 @@ -{ lib, stdenv, fetchurl, ocaml, eprover, zlib }: +{ lib, stdenv, fetchFromGitLab, ocamlPackages, eprover, z3, zlib }: stdenv.mkDerivation rec { pname = "iprover"; - version = "3.1"; + version = "3.8.1"; - src = fetchurl { - url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz"; - sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8"; + src = fetchFromGitLab { + owner = "korovin"; + repo = pname; + rev = "f61edb113b705606c7314dc4dce0687832c3169f"; + hash = "sha256-XXqbEoYKjoktE3ZBEIEFjLhA1B75zhnfPszhe8SvbI8="; }; + postPatch = '' + substituteInPlace configure --replace Linux Debian + ''; + strictDeps = true; - nativeBuildInputs = [ ocaml eprover ]; - buildInputs = [ zlib ]; + nativeBuildInputs = [ eprover ] ++ (with ocamlPackages; [ + ocaml findlib + ]); + buildInputs = [ zlib ocamlPackages.z3 z3 ] ++ (with ocamlPackages; [ + ocamlgraph yojson zarith + ]); preConfigure = "patchShebangs ."; installPhase = '' + runHook preInstall mkdir -p "$out/bin" cp iproveropt "$out/bin" - mkdir -p "$out/share/${pname}-${version}" - cp *.p "$out/share/${pname}-${version}" echo -e "#! ${stdenv.shell}\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/by-name/op/openswitcher/package.nix b/pkgs/by-name/op/openswitcher/package.nix new file mode 100644 index 000000000000..f8e3a5edef8e --- /dev/null +++ b/pkgs/by-name/op/openswitcher/package.nix @@ -0,0 +1,80 @@ +{ lib +, python3Packages +, fetchFromSourcehut +, desktop-file-utils +, gobject-introspection +, gtk3 +, libhandy +, meson +, ninja +, pkg-config +, scdoc +, wrapGAppsHook +}: + +python3Packages.buildPythonApplication rec { + pname = "openswitcher"; + version = "0.9.1"; + format = "other"; + + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = "pyatem"; + rev = version; + hash = "sha256-264XqBl+1qsAc5vOxJabbkubY+F72xo06WWishVEQOI="; + }; + + outputs = [ + "out" + "man" + ]; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + gtk3 + meson + ninja + pkg-config + scdoc + wrapGAppsHook + ]; + + dontWrapGApps = true; + + buildInputs = [ + gtk3 + libhandy + ]; + + propagatedBuildInputs = with python3Packages; [ + # for switcher-control, bmd-setup + paho-mqtt + pyatem + pygobject3 + # for atemswitch + requests + # for openswitcher-proxy + toml + ]; + + postInstall = '' + install -Dm644 -t $out/lib/udev/rules.d/ $src/100-blackmagicdesign.rules + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Blackmagic Design mixer control application"; + downloadPage = "https://git.sr.ht/~martijnbraam/pyatem"; + homepage = "https://openswitcher.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/by-name/te/termcap/package.nix b/pkgs/by-name/te/termcap/package.nix new file mode 100644 index 000000000000..6382ade90ea7 --- /dev/null +++ b/pkgs/by-name/te/termcap/package.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, enableStatic ? stdenv.hostPlatform.isStatic +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "termcap"; + version = "1.3.1"; + + src = fetchurl { + url = "mirror://gnu/termcap/termcap-${version}.tar.gz"; + hash = "sha256-kaDiLlOHykRntbyxjt8cUbkwJi/UZtX9o5bdnSZxkQA="; + }; + + patches = [ + (fetchpatch { + name = "0001-tparam-replace-write-with-fprintf.patch"; + url = "https://github.com/msys2/MINGW-packages/raw/c6691ad1bd9d4c6823a18068ca0683c3e32ea005/mingw-w64-termcap/0001-tparam-replace-write-with-fprintf.patch"; + hash = "sha256-R9XaLfa8fzQBt+M+uA1AFTvKYCeOWLUD/7GViazXwto="; + }) + ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + + env.NIX_CFLAGS_COMPILE = toString ([ + "-DSTDC_HEADERS" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-implicit-function-declaration" + ]); + + # Library only statically links by default + postInstall = lib.optionalString (!enableStatic) '' + rm $out/lib/libtermcap.a + '' + lib.optionalString enableShared (let + libName = "lib${pname}${stdenv.hostPlatform.extensions.sharedLibrary}"; + impLibName = "lib${pname}.dll.a"; + winImpLib = lib.optionalString stdenv.hostPlatform.isWindows + "-Wl,--out-implib,${impLibName}"; + in '' + ${stdenv.cc.targetPrefix}cc -shared -o ${libName} termcap.o tparam.o version.o ${winImpLib} + install -Dm644 ${libName} $out/lib + '' + lib.optionalString stdenv.hostPlatform.isWindows '' + install -Dm644 ${impLibName} $out/lib + ''); + + meta = { + description = "Terminal feature database"; + homepage = "https://www.gnu.org/software/termutils/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index b555b9197403..e4cfce0adbe1 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gtk-engine-murrine }: +{ lib, stdenvNoCC, fetchFromGitHub, unstableGitUpdater, gtk-engine-murrine }: let themeName = "Dracula"; - version = "4.0.0"; + version = "unstable-2023-12-16"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "v${version}"; - hash = "sha256-q3/uBd+jPFhiVAllyhqf486Jxa0mnCDSIqcm/jwGtJA="; + rev = "80d5a3fedf280e9cc7f2df3b100a1082c3bcd1cc"; + hash = "sha256-BPL0Msva1/sPQKPeRJHgvU+xXU3m8b2E6aDBLmXbkkA="; }; propagatedUserEnvPkgs = [ @@ -38,11 +38,13 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Dracula variant of the Ant theme"; homepage = "https://github.com/dracula/gtk"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ alexarice ]; + maintainers = with maintainers; [ alexarice msfjarvis ]; }; } diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index 3525d057b97a..4ec9fea5a0e6 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { pname = "libsystemtap"; - version = "4.6"; + version = "5.0"; src = fetchgit { url = "git://sourceware.org/git/systemtap.git"; - rev = "release-4.6"; - hash = "sha256-z7OUy0VGxK39aYCWFfvJnWk34Je0R+51kK5pGh7TzXM="; + rev = "release-5.0"; + hash = "sha256-dIBpySBTFn01CNtYwbXEramUlcYHPF6O/Ffr1BxdAH0="; }; dontBuild = true; diff --git a/pkgs/development/python-modules/pyatem/default.nix b/pkgs/development/python-modules/pyatem/default.nix new file mode 100644 index 000000000000..5b7749ea57c9 --- /dev/null +++ b/pkgs/development/python-modules/pyatem/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromSourcehut + +# build-system +, setuptools + +# dependencies +, pyusb +, tqdm +, zeroconf + +# tests +, pillow +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyatem"; + version = "0.9.0"; # check latest version in setup.py + pyproject = true; + + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = "pyatem"; + rev = version; + hash = "sha256-ntwUhgC8Cgrim+kU3B3ckgPDmPe+aEHDP4wsB45KbJg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyusb + tqdm + zeroconf + ]; + + nativeCheckInputs = [ + pillow + pytestCheckHook + ]; + + preCheck = '' + TESTDIR=$(mktemp -d) + cp -r pyatem/{test_*.py,fixtures} $TESTDIR/ + pushd $TESTDIR + ''; + + disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # colorspace mapping has weird, but constant offsets on aarch64-linux + "test_blueramp" + "test_greenramp" + "test_hues" + "test_primaries" + "test_redramp" + ]; + + postCheck = '' + popd + ''; + + pythonImportsCheck = [ + "pyatem" + ]; + + meta = with lib; { + description = "Library for controlling Blackmagic Design ATEM video mixers"; + homepage = "https://git.sr.ht/~martijnbraam/pyatem"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index c9849e27d6f9..01dd6651b7f6 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.22.0"; + version = "1.22.1"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f7JZ19BPYNB/2Jy3m4ro1sOHbLgCd53td2DyxqvUnRo="; + hash = "sha256-AUK42SGRVLG8ZBauaLXpq9qlJHeS4sDNSiukZ8TMDu0="; }; - cargoHash = "sha256-5QMKcvpAubJ55i9UjuuI/An4z0aOvrtvSiLhj+prepU="; + cargoHash = "sha256-hZLiYJrXR7MWu09lw5/pwYzxKUPy7S97qKGqEnHMYW0="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index d034e6eab15d..583d3ae3cbed 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.94.tar.xz", + "name": "factorio_alpha_x64-1.1.101.tar.xz", "needsAuth": true, - "sha256": "06z3l828drnqv075qa3sg8l1877dlakqnppr79y031jlp8vg19pm", + "sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.94/alpha/linux64", - "version": "1.1.94" + "url": "https://factorio.com/get-download/1.1.101/alpha/linux64", + "version": "1.1.101" }, "stable": { - "name": "factorio_alpha_x64-1.1.94.tar.xz", + "name": "factorio_alpha_x64-1.1.100.tar.xz", "needsAuth": true, - "sha256": "06z3l828drnqv075qa3sg8l1877dlakqnppr79y031jlp8vg19pm", + "sha256": "0ylr1x39x6x9d4zx5h0j4isgz5m56kznadf984bcvsl51plhh5wc", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.94/alpha/linux64", - "version": "1.1.94" + "url": "https://factorio.com/get-download/1.1.100/alpha/linux64", + "version": "1.1.100" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.94.tar.xz", + "name": "factorio_demo_x64-1.1.101.tar.xz", "needsAuth": false, - "sha256": "1z2l8xj3vvrd1m3q1rypczzqdzrmldmyipfg54qly8cfj3pxvk4w", + "sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.94/demo/linux64", - "version": "1.1.94" + "url": "https://factorio.com/get-download/1.1.101/demo/linux64", + "version": "1.1.101" }, "stable": { - "name": "factorio_demo_x64-1.1.94.tar.xz", + "name": "factorio_demo_x64-1.1.100.tar.xz", "needsAuth": false, - "sha256": "1z2l8xj3vvrd1m3q1rypczzqdzrmldmyipfg54qly8cfj3pxvk4w", + "sha256": "08xrmik7z7p0pgrnscriqhssv2chrpp42gi2dw8fgjb4wf76wqc4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.94/demo/linux64", - "version": "1.1.94" + "url": "https://factorio.com/get-download/1.1.100/demo/linux64", + "version": "1.1.100" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.94.tar.xz", + "name": "factorio_headless_x64-1.1.101.tar.xz", "needsAuth": false, - "sha256": "0ajs883dnz2ak1mxqvsw6hmpahcxqq243ravp5gb3iyiaaprqa4n", + "sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.94/headless/linux64", - "version": "1.1.94" + "url": "https://factorio.com/get-download/1.1.101/headless/linux64", + "version": "1.1.101" }, "stable": { - "name": "factorio_headless_x64-1.1.94.tar.xz", + "name": "factorio_headless_x64-1.1.100.tar.xz", "needsAuth": false, - "sha256": "0ajs883dnz2ak1mxqvsw6hmpahcxqq243ravp5gb3iyiaaprqa4n", + "sha256": "0d6qphx6kpdmvyf40j45ih2s8q48i28nac86pal4vvlkdwadsl4q", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.94/headless/linux64", - "version": "1.1.94" + "url": "https://factorio.com/get-download/1.1.100/headless/linux64", + "version": "1.1.100" } } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 257f62051a91..ea156e37db3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3022,7 +3022,7 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { - inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8bb4c1305a5e..455ea39e92b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9380,6 +9380,8 @@ self: super: with self; { pyatag = callPackage ../development/python-modules/pyatag { }; + pyatem = callPackage ../development/python-modules/pyatem { }; + pyatome = callPackage ../development/python-modules/pyatome { }; pycketcasts = callPackage ../development/python-modules/pycketcasts { };