diff --git a/.github/labeler.yml b/.github/labeler.yml index 3637d05f48b..5dd885552d6 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -36,11 +36,11 @@ "6.topic: GNOME": - doc/languages-frameworks/gnome.section.md - - nixos/modules/services/desktops/gnome3/**/* - - nixos/modules/services/x11/desktop-managers/gnome3.nix - - nixos/tests/gnome3-xorg.nix - - nixos/tests/gnome3.nix - - pkgs/desktops/gnome-3/**/* + - nixos/modules/services/desktops/gnome/**/* + - nixos/modules/services/x11/desktop-managers/gnome.nix + - nixos/tests/gnome-xorg.nix + - nixos/tests/gnome.nix + - pkgs/desktops/gnome/**/* "6.topic: golang": - doc/languages-frameworks/go.section.md diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 29ff865c935..bbd589d6f44 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6380,6 +6380,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdsp = { + github = "Mdsp9070"; + githubId = 44469426; + name = "Matheus de Souza Pessanha"; + email = "matheus_pessanha2001@outlook.com"; + }; meatcar = { email = "nixpkgs@denys.me"; github = "meatcar"; diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix index ce1dabe6bfa..6ea73fa5c67 100644 --- a/nixos/modules/services/video/mirakurun.nix +++ b/nixos/modules/services/video/mirakurun.nix @@ -8,6 +8,18 @@ let username = config.users.users.mirakurun.name; groupname = config.users.users.mirakurun.group; settingsFmt = pkgs.formats.yaml {}; + + polkitRule = pkgs.writeTextDir "share/polkit-1/rules.d/10-mirakurun.rules" '' + polkit.addRule(function (action, subject) { + if ( + (action.id == "org.debian.pcsc-lite.access_pcsc" || + action.id == "org.debian.pcsc-lite.access_card") && + subject.user == "${username}" + ) { + return polkit.Result.YES; + } + }); + ''; in { options = { @@ -48,6 +60,15 @@ in ''; }; + allowSmartCardAccess = mkOption { + type = types.bool; + default = true; + description = '' + Install polkit rules to allow Mirakurun to access smart card readers + which is commonly used along with tuner devices. + ''; + }; + serverSettings = mkOption { type = settingsFmt.type; default = {}; @@ -110,7 +131,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ mirakurun ]; + environment.systemPackages = [ mirakurun ] ++ optional cfg.allowSmartCardAccess polkitRule; environment.etc = { "mirakurun/server.yml".source = settingsFmt.generate "server.yml" cfg.serverSettings; "mirakurun/tuners.yml" = mkIf (cfg.tunerSettings != null) { diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e15585d7bcf..12995d3c5fe 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0v1g7j5q2j86c3r7jib8xs1sf2h3xvwv1s0xsqbig480fchlshjg"; - x86_64-darwin = "109529acrvyassq00mbhnwbxq7rfq9n69rgcw4n0rysgp8n58386"; - aarch64-linux = "0p6pz9apbfmr4pf7fikp2rmvk5gr87md1zrhr6hhd1qwgpc9kl07"; - armv7l-linux = "1qrp75nbzgqp7mv42m6wbj000l33rhfv7cnxdv6lp6cy05381aq6"; + x86_64-linux = "0l4lx5h2daw9c5vl4kz6sq2i58b45xy4948x4q0wnwbqdqlqc9s4"; + x86_64-darwin = "0qqgs7vns52bz9xkys822sjjkvyq4l20iipz6sx5kinxg6h04jyy"; + aarch64-linux = "1gnh5kk4r0kfik9yfvvcbavhws4n8kn89kyl2qzpa2ryy52kk81j"; + armv7l-linux = "0zz5fn9nxq58i3svhgc25s6fdz7i3rxc0naflyx1jzmpzipp4v6n"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.0"; + version = "1.56.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 9bd8e0f245b..decd4b10042 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "01bg6bjjbbdywd7r13safa5nxx1y9a8zia7q6z5anc60hfylvhd2"; - x86_64-darwin = "0xkzxlp45f9vl9yrrk8fynwpsv85yjmsp6ylm2fbmfddf9bqkjsb"; - aarch64-linux = "028g359jrbs1hbxwq4gqq1s08vv38i3x52vjalqrpc6b0wc5cc2w"; - armv7l-linux = "06w5h7q799b9kwagi6w3320yjdp66cwr6d0dd7sl4sirqnrap0i4"; + x86_64-linux = "1p68fvlr2fwrwr61gfrna3hjzgyazacr373hldbc4fxca3fdij76"; + x86_64-darwin = "0wyihr2yfzjaypsa682zdklfxn3m7zca81brkzdvrndw24hdcl8m"; + aarch64-linux = "0iw471n1fl8m2x06n2rdbkiwzhlc7lhk99vyql3z4fi0zyjy3pbn"; + armv7l-linux = "0dx1icp245cfx3hkkpzzgfg9y8sv45llx35s03w1zzga2h2vhm3a"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.0"; + version = "1.56.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index f45bff666cf..afe15949ee8 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { unpackPhase = lib.optionalString stdenv.isDarwin '' xar -xf $src - zcat Payload | cpio -i + zcat op.pkg/Payload | cpio -i ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index cbd45bfbd19..42b3feebfe2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "92.0.4496.0", - "sha256": "1kk1bybl6nx3z80agyljsvdb7yi3nna14aag71xhv4n6pygqfgdi", - "sha256bin64": "0b12ab20g5vay9x8j1zpj9zapdmm3him7rrm15jvsdakn60czdpr", + "version": "92.0.4503.0", + "sha256": "1fp4xz6x80m3ipcy4myzazyy1yj95qamyl6wf38mk2i6302gi2gb", + "sha256bin64": "0fwq8rn3v1dijj9xh6z7jw3xx2ihq0qcyh3bbcdd066w5ny6padm", "deps": { "gn": { - "version": "2021-04-29", + "version": "2021-05-07", "url": "https://gn.googlesource.com/gn", - "rev": "6771ce569fb4803dad7a427aa2e2c23e960b917e", - "sha256": "0lv1zs38qr862hwxrd3g6wz3l6v8j6p7b60nxyc5fhiglqxqz0im" + "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", + "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" } } }, diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 4053a042bfa..878d7e1184f 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,14 +44,16 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.20.6+k3s1"; # k3s git tag - traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag - k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag - k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag + k3sVersion = "1.21.0+k3s1"; # k3s git tag + k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # k3s git commit at the above version + + traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION + k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION + k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS # bundled into the k3s binary traefikChart = fetchurl { - url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; - sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9"; + url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; + sha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI="; }; # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the @@ -95,8 +97,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - leaveDotGit = true; # ./scripts/version.sh depends on git - sha256 = "sha256-IIZotJKQ/+WNmfcEJU5wFtZBufWjUp4MeVCRk4tSjyQ="; + sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -134,9 +135,13 @@ let # those. patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; + # Versioning info for build script + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + buildPhase = '' pushd go/src/${goPackagePath} @@ -175,7 +180,7 @@ let # See the above comment in k3sBuildStage1 patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkg-config zstd ]; + nativeBuildInputs = [ pkg-config zstd ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; @@ -186,6 +191,9 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; + DRONE_TAG = "v${version}"; + DRONE_COMMIT = k3sCommit; + # In order to build the thick k3s binary (which is what # ./scripts/package-cli does), we need to get all the binaries that script # expects in place. diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 6f97be468f5..ff86b64fec7 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.19.0"; + version = "0.20.0"; src = let @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-TKvUBof4TLcHr9hg6AOLjVd1NcAX9HHVuuABdFKRNQA="; - aarch64-linux = "sha256-BJb7h6kJZ3QhdlEqNHkiFp91uYLXzYHvKftxEAhjY38="; - x86_64-darwin = "sha256-Ig98IqLmlN9D4iXrP9SXYwTrQOvbtQ/tQW+uEmntm+I="; + x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A="; + aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg="; + x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 5917d9ce033..8bc76834752 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.19.0"; + version = "0.20.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0="; - x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U="; + x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y="; + x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8="; }.${system}; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 33fba6e5a0f..f941b83eb70 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -76,28 +76,31 @@ "version": "3.27.0" }, "azuread": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v0.10.0", - "sha256": "0i9xrsqgh1024189hihm2nqrcy2pcyf1bwxnamwmwph5cas6hfb3", - "version": "0.10.0" + "rev": "v1.4.0", + "sha256": "13y0h8af37gfsjhccbfsnj6kqcn61lr1znmsxipjr5h9ka5lc209", + "vendorSha256": null, + "version": "1.4.0" }, "azurerm": { "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.13.0", - "sha256": "0aj19vy1flpb2233rxaypjcfimjr1wfqri1m3p15dy1r108q84r7", - "version": "2.13.0" + "rev": "v2.58.0", + "sha256": "1zy3q5d63pz2rdczcs9xnxzasb2jbzhyg8nbk2r252mdnhx6h9vh", + "vendorSha256": null, + "version": "2.58.0" }, "azurestack": { - "owner": "terraform-providers", + "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", - "rev": "v0.9.0", - "sha256": "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324", - "version": "0.9.0" + "rev": "v0.10.0", + "sha256": "0lcwrp6n3l1nink06wq2nrirs6k3wwjmya1w06x14pvqqdj1d5c8", + "vendorSha256": null, + "version": "0.10.0" }, "baiducloud": { "owner": "terraform-providers", @@ -495,6 +498,7 @@ }, "keycloak": { "owner": "mrparkers", + "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", "rev": "v3.0.0", "sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a", diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d4a72e657cd..50161f1be14 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.0.0"; # Please backport all updates to the stable channel. + version = "5.1.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "17hxg61m9kk1kph6ifqy6507kzx5hi6yafr2mj8n0a6c39vc8f9g"; + sha256 = "1cirnnxy63jfkl98472k25bn1yp5apa7b5s74r42sxhlwzwkplw1"; }; nativeBuildInputs = [ @@ -79,6 +79,7 @@ in stdenv.mkDerivation rec { pango systemd xorg.libxcb + xorg.libxshmfence ]; runtimeDependencies = [ diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4d94801df95..3a22ea0681e 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -22,13 +22,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.24.4059"; - x86_64-linux = "3.24.2939"; + x86_64-darwin = "3.25.4095"; + x86_64-linux = "3.25.2940"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1zjv3d8jp0wldrzl02q9kir7q3y5bcb6hsfli6wip8bmaq78dksy"; - x86_64-linux = "1k9n58pr5fnqv9vacay5vrbs4pvq2p36c0dpg9rjdcnb2fwaqg5p"; + x86_64-darwin = "01gbmbxs3w7lwsy5wjpr7fgqkb20rj5fv1r3dsmjkfwy45pd835j"; + x86_64-linux = "1vb2fy8hijjp0193d32d8hw7h00w6wympf3zc96skk8hz3ks6xz8"; }.${system} or throwSystem; meta = with lib; { diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 0e779d6654e..4a741ab2b16 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript -, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg +, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip , lsb-release, freetype, fontconfig, polkit, polkit_gnome , pulseaudio }: @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango - gnome2.gtkglext libGLU libGL freetype fontconfig - polkit polkit_gnome pulseaudio + gnome2.gtkglext libGLU libGL minizip freetype + fontconfig polkit polkit_gnome pulseaudio ] ++ (with xorg; [ libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu libXrandr libXtst libXt libICE libSM libXrender diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index c305c771417..b6e318ec083 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,13 +4,13 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TailorDev"; repo = "Watson"; rev = version; - sha256 = "1yxqjirv7cpg4hqj4l3a53p3p3kl82bcx6drgvl9v849vcc3l7s0"; + sha256 = "0radf5afyphmzphfqb4kkixahds2559nr3yaqvni4xrisdaiaymz"; }; postInstall = '' diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 7a58db2bbd9..043c9f44bcf 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc="; + sha256 = "00gzm3g297s9bfp13vnb623p7dfac3g6cdhz2b3lc6l0kmnnqs1s"; }; - cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU="; + cargoSha256 = "1dpklyv1b9h4n4k3ar5qbzivds8r4mml76986ic8zj71fy5fxn08"; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 6607a4d00fb..4015ab02a3a 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.43.0"; + version = "2.45.0"; outputs = [ "out" "dev" ]; @@ -15,17 +15,18 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N7EvpcJjtK3INHK7PgoiEVIMq9zGcHKMeI+/dwZ3bNs="; + sha256 = "0aqf48zl7825v7x8c3x5w4d17m4qq377f1mn6xyqzf9b0dnk4i1j"; }; buildInputs = [ libusb1 gcc.cc.lib ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional enablePython pythonPackages.python; + ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); patches = lib.optionals enablePython [ ./py_sitepackage_dir.patch + ./py_pybind11_no_external_download.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch new file mode 100644 index 00000000000..2b48edb62e3 --- /dev/null +++ b/pkgs/development/libraries/librealsense/py_pybind11_no_external_download.patch @@ -0,0 +1,39 @@ +From 01e51b9c90ba51b2d0ca797dde676812cf3db415 Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" +Date: Mon, 10 May 2021 17:26:04 -0400 +Subject: [PATCH 1/1] V1 + +--- + wrappers/python/CMakeLists.txt | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt +index aa83e4c77..4ec92ccfa 100644 +--- a/wrappers/python/CMakeLists.txt ++++ b/wrappers/python/CMakeLists.txt +@@ -8,21 +8,8 @@ if (NOT BUILD_PYTHON_BINDINGS) + endif() + + set(DEPENDENCIES realsense2) +-# In order for the external project clone to occur during cmake configure step(rather than during compilation, as would normally happen), +-# we copy the external project declaration to the build folder and then execute it +-configure_file(${CMAKE_SOURCE_DIR}/third-party/pybind11/CMakeLists.txt ${CMAKE_BINARY_DIR}/external-projects/pybind11/CMakeLists.txt) +-execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) +-execute_process(COMMAND "${CMAKE_COMMAND}" --build . +- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/external-projects/pybind11" +-) + +-# Add pybind11 makefile +-add_subdirectory("${CMAKE_BINARY_DIR}/third-party/pybind11" +- "${CMAKE_BINARY_DIR}/third-party/pybind11" +- EXCLUDE_FROM_ALL +-) ++find_package(pybind11 REQUIRED) + + set(PYBIND11_CPP_STANDARD -std=c++11) + # Force Pybind11 not to share pyrealsense2 resources with other pybind modules. +-- +2.29.3 + diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 5ef9092fe96..65baaec3719 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1xinllv2cvxl9fxi15nayzw9lfzijb3m7i49gkkr46qr8xvsavyk"; + sha256 = "1qxvqqsflcn263yg7r8vvfc2c2fl3rh4dkzwzh926ijnbc2sk4nm"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 57a1b9b582d..e4e36a196fe 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.7"; + version = "0.10.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "scarface-4711"; repo = pname; rev = version; - sha256 = "sha256-IGfU9nnlfZf8U6pCzG7cegmqxmDNONom0U14PZHHaYY="; + sha256 = "02q76mbmg2rkm4shy2apwbw9pvicy9j5v4zgpjwzxif9yf7m8aqk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 700c23827fa..75de29b233d 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.40.0"; + version = "0.41.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-7qLiVN3pBkbZQlA12ZOkgpiV/JybrPTmEIeJjy4ZS3A="; + sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/py-dmidecode/default.nix b/pkgs/development/python-modules/py-dmidecode/default.nix new file mode 100644 index 00000000000..e74a8d7ac29 --- /dev/null +++ b/pkgs/development/python-modules/py-dmidecode/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, dmidecode }: + +buildPythonPackage rec { + pname = "py-dmidecode"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bv1vmhj8h520kj6slwpz16xfmgp117yjjkfyihkl5ix6mn5zkpa"; + }; + + propagatedBuildInputs = [ dmidecode ]; + + # Project has no tests. + doCheck = false; + pythonImportsCheck = [ "dmidecode" ]; + + meta = with lib; { + homepage = "https://github.com/zaibon/py-dmidecode/"; + description = "Python library that parses the output of dmidecode"; + license = licenses.asl20; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 225a8f149e4..f4b2efbc2ba 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , requests +, cryptography , python }: @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "0y96wsbci296m1rcxx0ybx8r44rdvyb59p1jl27p7rgz7isr3kx1"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests cryptography ]; checkPhase = '' ${python.interpreter} test/test.py diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix new file mode 100644 index 00000000000..58ca9107c54 --- /dev/null +++ b/pkgs/development/tools/earthly/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "earthly"; + version = "0.5.11"; + + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly"; + rev = "v${version}"; + sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv"; + }; + + vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k"; + + postInstall = '' + mv $out/bin/debugger $out/bin/earthly-debugger + mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater + ''; + + meta = with lib; { + description = "Build automation for the container era"; + homepage = "https://earthly.dev/"; + changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ mdsp ]; + }; +} diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index cafa63e96bd..0c52a89229d 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Bo6ZSpecdMX/Hoj0N1/iptfqybPUoQ0T9IQima+Bbo="; + sha256 = "sha256-5+h1fyTCp1jUZeKRCeDhfqAA11SMyR5nw2Y2x6JyIwY="; }; - vendorSha256 = "sha256-oP7ZekG7YdRhUvt48wxalt8y8QmVFkAw9GRIKBmi9sg="; + vendorSha256 = "sha256-m5ddUwuTX0mSihkoGIMQKidptwUL8Bao5HgHJBWX0os="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 9b645fb55e3..d1632ebcf5d 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,19 +16,21 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.9.2"; + version = "1.10.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI="; + sha256 = "sha256-aNStR86biNHwyg3dSI+CGib3XFhL5ZJ55d29E2K9qd0="; }; - cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI="; + cargoSha256 = "sha256-JXjiI+fTB0YlnhKO6QfGl4YOEQNfpuWsza2TsM9fwIk="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; + buildAndTestSubdir = "cli"; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem @@ -51,9 +53,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = '' - # remove test plugin and test server - rm -r $out/lib $out/bin/test_server $out/bin/denort - installShellCompletion --cmd deno \ --bash <($out/bin/deno completions bash) \ --fish <($out/bin/deno completions fish) \ diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index c1dbd0f773a..8ae163f2c90 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.22.1"; + version = "0.22.2"; shas = { - x86_64-linux = "sha256-rHI5qzwmDvlIdjUCZwvl6/s2Oe6d3/V7TJwfP1AFjik="; - aarch64-linux = "sha256-7VhrOkzWayZFTsq0II5uh+TxXaIDSkc0E19ZwT3Hl6c="; - x86_64-darwin = "sha256-zXXL2YqgjFmuDHGReIGWVxfSS3PMND0J0qlHRV/rKs8="; - aarch64-darwin = "sha256-X/CCJn5yWJH2x6lCGAFllrQUj7XLA3TICRP3aiWytjk="; + x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q="; + aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s="; + x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs="; + aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI="; }; } diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix new file mode 100644 index 00000000000..219bac701dc --- /dev/null +++ b/pkgs/games/steam-tui/default.nix @@ -0,0 +1,44 @@ +{ lib +, rustPlatform +, steamcmd +, fetchFromGitHub +, steam-run-native +, runtimeShell +, withWine ? false +, wine +}: + +rustPlatform.buildRustPackage rec { + pname = "steam-tui"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "dmadisetti"; + repo = pname; + rev = version; + sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40="; + }; + + cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; + + buildInputs = [ steamcmd steam-run-native ] + ++ lib.optional withWine wine; + + preFixup = '' + mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped + cat > $out/bin/steam-tui <