jiebi/CodeConvo huggingface dataset:
<ins> import ./make-test-python.nix ( { pkgs, lib, ... }: let user = "alice"; # from ./common/user-account.nix password = "foobar"; # from ./common/user-account.nix in { name = "cockpit"; meta = { maintainers = with lib.maintainers; [ lucasew ]; }; nodes = { server = { config, ... }: { imports = [ ./common/user-account.nix ]; security.polkit.enable = true; users.users.${user} = { extraGroups = [ "wheel" ]; }; services.cockpit = { enable = true; openFirewall = true; settings = { WebService = { Origins = "https://server:9090"; }; }; }; }; client = { config, ... }: { imports = [ ./common/user-account.nix ]; environment.systemPackages = let seleniumScript = pkgs.writers.writePython3Bin "selenium-script" { libraries = with pkgs.python3Packages; [ selenium ]; } '' from selenium import webdriver from selenium.webdriver.common.by import By from selenium.webdriver.firefox.options import Options from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC from time import sleep def log(msg): from sys import stderr print(f"[*] {msg}", file=stderr) log("Initializing") options = Options() options.add_argument("--headless") driver = webdriver.Firefox(options=options) driver.implicitly_wait(10) log("Opening homepage") driver.get("https://server:9090") wait = WebDriverWait(driver, 60) def wait_elem(by, query): wait.until(EC.presence_of_element_located((by, query))) def wait_title_contains(title): wait.until(EC.title_contains(title)) def find_element(by, query): return driver.find_element(by, query) def set_value(elem, value): script = 'arguments[0].value = arguments[1]' return driver.execute_script(script, elem, value) log("Waiting for the homepage to load") # cockpit sets initial title as hostname wait_title_contains("server") wait_elem(By.CSS_SELECTOR, 'input#login-user-input') log("Homepage loaded!") log("Filling out username") login_input = find_element(By.CSS_SELECTOR, 'input#login-user-input') set_value(login_input, "${user}") log("Filling out password") password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input') set_value(password_input, "${password}") log("Submiting credentials for login") driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() # driver.implicitly_wait(1) # driver.get("https://server:9090/system") log("Waiting dashboard to load") wait_title_contains("${user}@server") log("Waiting for the frontend to initalize") sleep(1) log("Looking for that banner that tells about limited access") container_iframe = find_element(By.CSS_SELECTOR, 'iframe.container-frame') driver.switch_to.frame(container_iframe) assert "Web console is running in limited access mode" in driver.page_source driver.close() ''; in with pkgs; [ firefox-unwrapped geckodriver seleniumScript ]; }; }; testScript = '' start_all() server.wait_for_open_port(9090) server.wait_for_unit("network.target") server.wait_for_unit("multi-user.target") server.systemctl("start", "polkit") client.wait_for_unit("multi-user.target") client.succeed("curl -k https://server:9090 -o /dev/stderr") print(client.succeed("whoami")) client.succeed('PYTHONUNBUFFERED=1 selenium-script') ''; } ) </ins>
<ins> diff --git a/src/systemd/Makefile.am b/src/systemd/Makefile.am index f28ea41df..684b82006 100644 --- a/src/systemd/Makefile.am +++ b/src/systemd/Makefile.am @@ -23,10 +23,10 @@ dist_motd_SCRIPTS = src/systemd/update-motd # Automake: 'Variables using ... ‘sysconf’ ... are installed by install-exec.' install-exec-hook:: -	mkdir -p $(DESTDIR)$(sysconfdir)/motd.d -	ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/motd.d/cockpit -	mkdir -p $(DESTDIR)$(sysconfdir)/issue.d -	ln -sTfr $(DESTDIR)/run/cockpit/motd $(DESTDIR)$(sysconfdir)/issue.d/cockpit.issue +	mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/motd.d +	ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/motd.d/cockpit +	mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/issue.d +	ln -sTfr $(DESTDIR)$(prefix)/run/cockpit/motd $(DESTDIR)$(prefix)$(sysconfdir)/issue.d/cockpit.issue tempconfdir = $(prefix)/lib/tmpfiles.d nodist_tempconf_DATA = src/systemd/cockpit-tempfiles.conf diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am index ed4e4363e..77a35b0e5 100644 --- a/src/ws/Makefile-ws.am +++ b/src/ws/Makefile-ws.am @@ -169,8 +169,8 @@ install-tests:: $(INSTALL_DATA) mock-pam-conv-mod.so $(DESTDIR)$(pamdir)/ install-exec-hook:: -	mkdir -p $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d -	chmod 755 $(DESTDIR)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(sysconfdir)/cockpit/machines.d +	mkdir -p $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d +	chmod 755 $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/ws-certs.d $(DESTDIR)$(prefix)$(sysconfdir)/cockpit/machines.d dist_check_DATA +=  src/ws/mock-combined.crt  </ins>
<ins> diff --git a/tools/node-modules b/tools/node-modules index 518875d..72b51e0 100755 --- a/tools/node-modules +++ b/tools/node-modules @@ -7,6 +7,7 @@ V="${V-0}" # default to friendly messages set -eu cd "${0%/*}/.." +exit 0 . tools/git-utils.sh cmd_remove() { </ins>
++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26 <del> ; </del> <ins> # Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits) ++ builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;}) [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; } { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; } { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; } { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; } { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; } { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; } { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; } { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; } { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; } { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]; </ins> javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
github = "twey"; name = "James ‘Twey’ Kay"; }; <ins> twhitehead = { name = "Tyson Whitehead"; email = "twhitehead@gmail.com"; github = "twhitehead"; keys = [{ longkeyid = "rsa2048/0x594258F0389D2802"; fingerprint = "E631 8869 586F 99B4 F6E6  D785 5942 58F0 389D 2802"; }]; }; </ins> typetetris = { email = "ericwolf42@mail.com"; github = "typetetris";
<ins> { stdenv, fetchurl, cmake , zlib, libGL, libGLU, libpng, freeglut }: stdenv.mkDerivation rec { version = "1.4.0"; name = "gl2ps-${version}"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${name}.tgz"; sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; }; buildInputs = [ cmake zlib libGL libGLU libpng freeglut ]; meta = with stdenv.lib; { homepage = http://geuz.org/gl2ps; description = "An OpenGL to PostScript printing library"; platforms = platforms.all; license = licenses.lgpl2; maintainers = with maintainers; [raskin twhitehead]; }; } </ins>
<ins> { config, lib, pkgs, ... }: let cfg = config.programs.darling; in { options = { programs.darling = { enable = lib.mkEnableOption (lib.mdDoc "Darling, a Darwin/macOS compatibility layer for Linux"); package = lib.mkPackageOptionMD pkgs "darling" {}; }; }; config = lib.mkIf cfg.enable { security.wrappers.darling = { source = lib.getExe cfg.package; owner = "root"; group = "root"; setuid = true; }; }; } </ins>
cups-pdf = handleTest ./cups-pdf.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; <ins> darling = handleTest ./darling.nix {}; </ins> deepin = handleTest ./deepin.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {};
<ins> import ./make-test-python.nix ({ pkgs, lib, ... }: let # Well, we _can_ cross-compile from Linux :) hello = pkgs.runCommand "hello" { sdk = "${pkgs.darling.sdk}/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"; nativeBuildInputs = with pkgs.llvmPackages_latest; [ clang-unwrapped lld ]; src = pkgs.writeText "hello.c" '' #include <stdio.h> int main() { printf("Hello, Darling!n"); return 0; } ''; } '' clang  -target x86_64-apple-darwin  -fuse-ld=lld  -nostdinc -nostdlib  -mmacosx-version-min=10.15  --sysroot $sdk  -isystem $sdk/usr/include  -L $sdk/usr/lib -lSystem  $src -o $out ''; in { name = "darling"; meta.maintainers = with lib.maintainers; [ zhaofengli ]; nodes.machine = { programs.darling.enable = true; }; testScript = '' start_all() # Darling holds stdout until the server is shutdown machine.succeed("darling ${hello} >hello.out") machine.succeed("grep Hello hello.out") machine.succeed("darling shutdown") ''; }) </ins>
For systems without CD drive, the NixOS live CD can be booted from a USB stick. You can use the <command>dd</command> utility to write the image: <command>dd if=<replaceable>path-to-image</replaceable> <del> of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying </del> <ins> of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying </ins> the correct drive; you can use the <command>lsblk</command> command to get a list of block devices. <del> </para> <para> On macOS: </del> <ins> <note> <title>On macOS</title> <para> </ins> <programlisting> $ diskutil list [..]
Unmount of all volumes on diskN was successful $ sudo dd bs=1m if=nix.iso of=/dev/rdiskN </programlisting> <del> Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command> completes in minutes instead of hours. After <command>dd</command> completes, a GUI dialog "The disk you inserted was not readable by this computer" will pop up, which can be ignored. </del> <ins> Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command> completes in minutes instead of hours. After <command>dd</command> completes, a GUI dialog "The disk you inserted was not readable by this computer" will pop up, which can be ignored. </para> </note> </ins> </para> <para> The <command>dd</command> utility will write the image verbatim to the drive, making it the recommended option for both UEFI and non-UEFI installations. <del> For non-UEFI installations, you can alternatively use <link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If you cannot use <command>dd</command> for a UEFI installation, you can also mount the ISO, copy its contents verbatim to your drive, then either: <itemizedlist> <listitem> <para> Change the label of the disk partition to the label of the ISO (visible with the blkid command), or </para> </listitem> <listitem> <para> Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive and change the <literal>root=</literal> field in the <literal>options</literal> line to point to your drive (see the documentation on <literal>root=</literal> in <link xlink:href="https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt"> the kernel documentation</link> for more details). </para> </listitem> <listitem> <para> If you want to load the contents of the ISO to ram after bootin (So you can remove the stick after bootup) you can append the parameter <literal>copytoram</literal> to the <literal>options</literal> field. </para> </listitem> </itemizedlist> </del> </para> </section>
version="5.0" xml:id="sec-installation"> <title>Installing NixOS</title> <del> <para> NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow. </para> <orderedlist> <listitem> <para> Boot from the CD. </para> <variablelist> <varlistentry> <term> UEFI systems </term> <listitem> <para> You should boot the live CD in UEFI mode (consult your specific hardware's documentation for instructions). You may find the <link xlink:href="http://www.rodsbooks.com/refind">rEFInd boot manager</link> useful. </para> </listitem> </varlistentry> </variablelist> </listitem> <listitem> <para> The CD contains a basic NixOS installation. (It also contains Memtest86+, useful if you want to test new hardware). When it’s finished booting, it should have detected most of your hardware. </para> </listitem> <listitem> <para> The NixOS manual is available on virtual console 8 (press Alt+F8 to access) or by running <command>nixos-help</command>. </para> </listitem> <listitem> <para> You get logged in as <literal>root</literal> (with empty password). </para> </listitem> <listitem> <para> If you downloaded the graphical ISO image, you can run <command>systemctl start display-manager</command> to start KDE. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!) </para> </listitem> <listitem> </del> <ins> <section xml:id="sec-installation-booting"> <title>Booting the system</title> <para> NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow. </para> <para> The installation media can be burned to a CD, or now more commonly, "burned" to a USB drive (see <xref linkend="sec-booting-from-usb"/>). </para> <para> The installation media contains a basic NixOS installation. When it’s finished booting, it should have detected most of your hardware. </para> <para> The NixOS manual is available on virtual console 8 (press Alt+F8 to access) or by running <command>nixos-help</command>. </para> <para> You are logged-in automatically as <literal>root</literal>. (The <literal>root</literal> user account has an empty password.) </para> <para> If you downloaded the graphical ISO image, you can run <command>systemctl start display-manager</command> to start KDE. If you want to continue on the terminal, you can use <command>loadkeys</command> to switch to your preferred keyboard layout. (We even provide neo2 via <command>loadkeys de neo</command>!) </para> <section xml:id="sec-installation-booting-networking"> <title>Networking in the installer</title> </ins> <para> The boot process should have brought up networking (check <command>ip a</command>). Networking is necessary for the installer, since it will
# nano /mnt/etc/nixos/configuration.nix # nixos-install # reboot</screen> <del> </example> <example xml:id='ex-config'> <title>NixOS Configuration</title> </del> <ins> </para> </example> <example xml:id='ex-config'> <title>NixOS Configuration</title> </ins> <screen> { config, pkgs, ... }: { imports = [
services.sshd.enable = true; } </screen> <del> </example> <xi:include href="installing-usb.xml" /> <xi:include href="installing-pxe.xml" /> <xi:include href="installing-virtualbox-guest.xml" /> <xi:include href="installing-from-other-distro.xml" /> <xi:include href="installing-behind-a-proxy.xml" /> </del> <ins> </example> </section> <section xml:id="sec-installation-additional-notes"> <title>Additional installation notes</title> <xi:include href="installing-usb.xml" /> <xi:include href="installing-pxe.xml" /> <xi:include href="installing-virtualbox-guest.xml" /> <xi:include href="installing-from-other-distro.xml" /> <xi:include href="installing-behind-a-proxy.xml" /> </section> </ins> </chapter>
, python, pygobject3, gtk3, gnome3, substituteAll , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas <del> , speechd, brltty, setproctitle, gst_all_1, gst-python </del> <ins> , speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python </ins> }: buildPythonApplication rec {
]; propagatedBuildInputs = [ <del> # TODO: re-add liblouis when it is fixed pygobject3 pyatspi dbus-python pyxdg brltty speechd gst-python setproctitle </del> <ins> pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle </ins> ]; <ins> strictDeps = false; </ins> buildInputs = [ python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
<del> { stdenv, fetchFromGitHub, cmake, bison }: </del> <ins> { stdenv, fetchFromGitHub, cmake, bison, spirv-tools, jq }: </ins> stdenv.mkDerivation rec { name = "glslang-git-${version}"; <del> version = "2017-08-31"; </del> <ins> version = "2018-02-05"; </ins> # `vulkan-loader` requires a specific version of `glslang` as specified in # `<vulkan-loader-repo>/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; <del> rev = "3a21c880500eac21cdf79bef5b80f970a55ac6af"; sha256 = "1i15m17r0acmzjrkybris2rgw15il05a4w5h7vhhsiyngcvajcyn"; </del> <ins> rev = "2651ccaec8"; sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq"; </ins> }; <del> buildInputs = [ cmake bison ]; </del> <ins> buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs; </ins> enableParallelBuilding = true; <ins> patchPhase = '' cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers ''; preConfigure = '' HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then echo "ERROR: spirv-tools commits do not match expected versions"; exit 1; fi ''; </ins> meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL";
libXext, wayland, libGL, makeWrapper }: let <del> version = "1.0.61.1"; </del> <ins> version = "1.1.70.0"; </ins> src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; <del> sha256 = "043kw6wnrpdplnb40x6n9rgf3gygsn9jiv91y458sydbhalfr945"; </del> <ins> sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp"; </ins> }; in
]; outputs = [ "out" "dev" "demos" ]; <ins> patches = [ ./rev-file.patch ]; postUnpack = '' # Hack so a version header can be generated. Relies on ./rev-file.patch to work. mkdir -p "$sourceRoot/external/glslang/External" echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools" ''; </ins> preConfigure = '' checkRev() { [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) } <del> checkRev spirv-tools "${spirv-tools.src.rev}" checkRev spirv-headers "${spirv-tools.headers.rev}" </del> checkRev glslang "${glslang.src.rev}" '';
<ins> diff --git a/CMakeLists.txt b/CMakeLists.txt index c9f73ce96..d14ffeed9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output) endmacro() # Define macro used for generating header files containing commit IDs for external dependencies -macro(run_external_revision_generate source_dir symbol_name output) +macro(run_external_revision_generate rev_file symbol_name output) add_custom_command(OUTPUT ${output} # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the # subsequent line (to ensure that the script is re-run when the revision file is modified). -    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} -    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index +    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output} +    DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file} ) endmacro() </ins>
let spirv_sources = { <del> # `vulkan-loader` requires a specific version of `spirv-tools` and `spirv-headers` as specified in # `<vulkan-loader-repo>/external_revisions/spirv-tools_revision`. </del> <ins> # `glslang` requires a specific version of `spirv-tools` and `spirv-headers` as specified in `known-good.json`. </ins> tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; <del> rev = "7e2d26c77b606b21af839b37fd21381c4a669f23"; sha256 = "1nlzj081v1xdyfz30nfs8hfcnqd072fra127h46gav179f04kss2"; </del> <ins> rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8"; sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk"; </ins> }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; <del> rev = "2bb92e6fe2c6aa410152fc6c63443f452acb1a65"; sha256 = "1rgjd7kpa7xpbwpzd6m3f6yq44s9xn5ddhz135213pxwbi5c0c26"; </del> <ins> rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00"; sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm"; </ins> }; };
in py.pkgs.buildPythonApplication rec { pname = "awscli"; <del> version = "1.14.50"; </del> <ins> version = "1.15.10"; </ins> src = py.pkgs.fetchPypi { inherit pname version; <del> sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c"; </del> <ins> sha256 = "0nwpanbfx5h0bad8wwvvbhpjf9r6n885bbv2w8mw7vijdgclkq8x"; </ins> }; # No tests included
less ]; <ins> postPatch = '' for i in {py,cfg}; do substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11" done ''; </ins> postInstall = '' mkdir -p $out/etc/bash_completion.d echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli
<ins> # VTE { config, pkgs, lib, ... }: with lib; let vteInitSnippet = '' # Show current working directory in VTE terminals window title. # Supports both bash and zsh, requires interactive shell. . ${pkgs.vte}/etc/profile.d/vte.sh ''; in { options = { programs.bash.vteIntegration = mkOption { default = false; type = types.bool; description = '' Whether to enable Bash integration for VTE terminals. This allows it to preserve the current directory of the shell across terminals. ''; }; programs.zsh.vteIntegration = mkOption { default = false; type = types.bool; description = '' Whether to enable Zsh integration for VTE terminals. This allows it to preserve the current directory of the shell across terminals. ''; }; }; config = mkMerge [ (mkIf config.programs.bash.vteIntegration { programs.bash.interactiveShellInit = vteInitSnippet; }) (mkIf config.programs.zsh.vteIntegration { programs.zsh.interactiveShellInit = vteInitSnippet; }) ]; } </ins>
./services/desktops/gnome3/gnome-remote-desktop.nix ./services/desktops/gnome3/gnome-online-miners.nix ./services/desktops/gnome3/gnome-settings-daemon.nix <del> ./services/desktops/gnome3/gnome-terminal-server.nix </del> ./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/gvfs.nix ./services/desktops/gnome3/rygel.nix