Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c44bd49ced16
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 242018472706
Choose a head ref

Commits on Mar 6, 2020

  1. Copy the full SHA
    ed33a6c View commit details

Commits on Mar 9, 2020

  1. androidenv: update the generated expressions

    ... running `generate.sh`.
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    e003ca0 View commit details
  2. androidenv: bump emulator version to latest stable - as per Linux

    Move to a known version of the emulator.  Each OS has a distinct
    version... pick the one on Linux.  A better solution would be to let
    the user of `emulateApp` overload what the emulator version shall be
    (and maybe it is already possible and I do not see it) - without need
    to reproduce large portions of `default.nix`.
    
    Using the previous emulator showed the following warning:
    ```
    Your emulator is out of date, please update by launching Android Studio:
    ```
    
    I am not aware of any reasons for not wanting the latest emulator (as
    I expect it shall be compatible usually with more system images - not
    less), so bump its default version.
    
    Emulator release notes:
    https://developer.android.com/studio/releases/emulator
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    6da0e0b View commit details
  3. Copy the full SHA
    3286057 View commit details
  4. androidenv: manually (!) delete oldest revision of google images

    ... as same name hence clashing.
    
    This shall rather be solved by enhancement of the scripts.
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    72e3836 View commit details
  5. androidenv: manually (!) delete default images with same name

    ... complex as apparently dependent on OS of host of emulator.
    
    This shall rather be solved by enhancement of the scripts.
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    91411f0 View commit details
  6. androidenv: add missing linux dependencies

    This is extracted from https://github.com/NixOS/nixpkgs PR 78623.
    
    The symptom I observed was:
    ```
    builder for '/nix/store/7zz585ch9jqjvz8k88rf7fs046inxszq-emulator-30.0.3.drv' failed with exit code 1; last 10 log lines:
        libXext.so.6 -> found: /nix/store/qkmj8pa3ka9v335bbgx74ah4080fwdbf-libXext-1.3.4/lib/libXext.so.6
        libXfixes.so.3 -> found: /nix/store/nhp59xxq4g51mgpwgjsp8pvkn7531b86-libXfixes-5.0.3/lib/libXfixes.so.3
        libXi.so.6 -> not found!
        libXrender.so.1 -> not found!
        libXtst.so.6 -> not found!
        libasound.so.2 -> not found!
        libz.so.1 -> found: /nix/store/pb2am7dfsv524pb2z7m8mp8nkcmgd3cl-zlib-1.2.11/lib/libz.so.1
        libdbus-1.so.3 -> found: /nix/store/ddqrvb1b0xdb8g18f4advmq4wk0aiknd-dbus-1.12.16-lib/lib/libdbus-1.so.3
        libGL.so.1 -> found: /nix/store/bbpgyifsh2hv0ivhl3g4ik2nw7d10zdx-emulator-30.0.3/libexec/android-sdk/emulator/lib64/gles_mesa/libGL.so.1
        libc++.so.1 -> found: /nix/store/bbpgyifsh2hv0ivhl3g4ik2nw7d10zdx-emulator-30.0.3/libexec/android-sdk/emulator/lib64/libc++.so.1
    ```
    Freeman Latif authored and lucafavatella committed Mar 9, 2020
    Copy the full SHA
    954b406 View commit details
  7. androidenv/emulate-app: fix image id for recent device manager

    Symptom:
    ```
    Available Android targets:
    ----------
    id: 1 or "android-28"
         Name: Android 9
         Type: Platform
         API level: 28
         Revision: 6
         Skins: HVGA, QVGA, WQVGA400, WQVGA432, WSVGA, WVGA800 (default), WVGA854, WXGA720, WXGA800, WXGA800-7in
     Tag/ABIs : google_ndk_playstore/x86
    ...
    Error: Invalid --tag google_apis_playstore for the selected target.
    ```
    
    For creation of AVD, switch from `android` to `avdmanager` as the
    latter seems enabling selecting the image with less friction (and is
    better documented as not deprecated).  This requires using recent
    tools - from https://developer.android.com/studio/releases/sdk-tools :
    > SDK Tools, Revision 25.3.0 (March 2017)
    > ...
    > `android avd` command-line functionality replaced with new
    > `avdmanager` tool.
    
    For listing of targets, switch from `android` to `avdmanager` as the
    `android` command invocation fails in recent tools.  Symptom (not
    missing `s` as backward incompatibility):
    ```
    Invalid or unsupported command "list targets"
    
    Supported commands are:
    android list target
    android list avd
    android list device
    android create avd
    android move avd
    android delete avd
    android list sdk
    android update sdk
    ```
    
    References:
    - https://developer.android.com/studio/tools/help/android
    - https://developer.android.com/studio/command-line/avdmanager
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    c506188 View commit details
  8. androidenv: manually (!) delete more complex version of google images

    This commit was built as a revert commit followed by deletion:
    * Revert "androidenv: manually (!) delete oldest revision of google
      images".
    * Delete other revision.
    
    Using `systemImageType = "google_apis_playstore"` (and `abiVersion =
    "x86"` and `platformVersion = "28"` - that I expect resolved to
    `97d9d4f4a2afa8b0f5d52e90748e19c10406ca93`), the symptom is:
    ```
    Warning: Observed package id 'system-images;android-28;google_ndk_playstore;x86' in inconsistent location '/nix/store/...-androidsdk/libexec/android-sdk/system-images/android-28/google_apis_playstore/x86' (Expected '/nix/store/...-androidsdk/libexec/android-sdk/system-images/android-28/google_ndk_playstore/x86')
    ...
    Error: Package path is not valid. Valid system image paths are:
    system-images;android-28;google_ndk_playstore;x86
    ```
    How is the actual image name `google_ndk_playstore` when the fetched
    image has id `google_apis_playstore`?
    
    Attempt keeping - of the two images - the one that looks simpler.
    
    For the `"28".google_apis."x86"` images, in the XML the differences
    are: more complex license (what is `arm-dbt`?); higher emulator.
    Namely:
    ```
    		<uses-license ref="android-sdk-license"/>
    		<dependencies>
    			<dependency path="patcher;v4"/>
    			<dependency path="emulator">
    				<min-revision>
    					<major>27</major>
    					<minor>1</minor>
    					<micro>7</micro>
    ...
    		<uses-license ref="android-sdk-arm-dbt-license"/>
    		<dependencies>
    			<dependency path="patcher;v4"/>
    			<dependency path="emulator">
    				<min-revision>
    					<major>29</major>
    					<minor>1</minor>
    					<micro>12</micro>
    ```
    
    Analogously for `"28".google_apis_playstore."x86"`.
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    f01278d View commit details
  9. androidenv: align basic emulateApp usage example

    ... to the actually tested one.
    lucafavatella committed Mar 9, 2020
    Copy the full SHA
    d56fd69 View commit details

Commits on Mar 29, 2020

  1. Copy the full SHA
    9404daf View commit details
  2. Copy the full SHA
    cb1dd64 View commit details
  3. Copy the full SHA
    cdad5f9 View commit details
  4. alsa-ucm-conf: init at 1.2.2

    roastiek committed Mar 29, 2020
    Copy the full SHA
    4acda90 View commit details
  5. Copy the full SHA
    f0a6dfc View commit details
  6. alsaLib: 1.1.9 -> 1.2.2

    roastiek committed Mar 29, 2020
    Copy the full SHA
    4fef426 View commit details
  7. linux config: enable SND CA0132 DSP loading

    Since we select everything as a module, snd_hda_codec_ca0132 is built as
    well. DSP loading is not enabled by default, but without it the
    soundcard produces timeouts within ALSA and does not emit sound.
    Explicitly enable the firmware loading to ensure Soundblaster
    Z/Zx/ZxR/Recon devices can be used with NixOS.
    The patch to enable this by default in the kernel is staged for 5.8.
    Emantor committed Mar 29, 2020
    Copy the full SHA
    62cdbd6 View commit details

Commits on Mar 31, 2020

  1. php: init phpXYbase packages and make the default php extended by def…

    …ault
    
    Also, add opcache to default extensions since it significantly
    increases PHP's performance and is by default enabled on Debian based
    distributions. Not having it enabled by default results in a puzzling
    performance loss for anyone attempting to migrate from Debian/Ubuntu
    to NixOS who is unaware of this. Therefore, enable it by default. /talyz
    etu authored and talyz committed Mar 31, 2020
    Copy the full SHA
    96a5e0c View commit details
  2. unit: Make unit use phpbase packages

    etu authored and talyz committed Mar 31, 2020
    Copy the full SHA
    1983417 View commit details

Commits on Apr 1, 2020

  1. Copy the full SHA
    15002f1 View commit details
  2. cmake: 3.16.5 -> 3.17.0

    dasj19 authored and ttuegel committed Apr 1, 2020
    Copy the full SHA
    b18e7e5 View commit details
  3. Copy the full SHA
    f26b2af View commit details

Commits on Apr 2, 2020

  1. Merge pull request #83975 from jtojnar/gnome-team

    tree-wide: Switch from gnome3.maintainers to lib.teams.gnome
    worldofpeace authored Apr 2, 2020
    Copy the full SHA
    7d91eb2 View commit details
  2. zulip: 4.0.0 -> 5.0.0

    alevy committed Apr 2, 2020
    Copy the full SHA
    1586f28 View commit details
  3. openssl(_1_1): patch CVE-2019-1551

    fetchpatch can't be used here and fetchurl from GitHub
    like in PR #82928 has the risk of breaking the hash later;
    fortunately the patches aren't too large.
    
    (cherry picked from commit 2071e3b)
    vcunat authored and flokli committed Apr 2, 2020
    Copy the full SHA
    e48a55d View commit details
  4. Copy the full SHA
    ad871d2 View commit details
  5. Copy the full SHA
    37dfac7 View commit details
  6. openssl: 1.1.1d -> 1.1.1f

    pyca/pyopenssl#899 (comment)
    The tests in python3.pkgs.pyopenssl succeed!
    Fixing this problem we experienced is listed as the only major change:
    https://www.openssl.org/news/openssl-1.1.1-notes.html
    vcunat committed Apr 2, 2020
    Copy the full SHA
    6c8692f View commit details
  7. Merge pull request #83862 from dasj19/cmake_update

    cmake: 3.16.5 -> 3.17.0
    ttuegel authored Apr 2, 2020
    Copy the full SHA
    40239ac View commit details
  8. mwic: 0.7.7 -> 0.7.8

    matthiasbeyer committed Apr 2, 2020
    Copy the full SHA
    2bac620 View commit details
  9. go_1_14: 1.14 -> 1.14.1

    This contains at least golang/go#37807, which
    currently causes some of our go binaries to just fail when booted with
    older kernels.
    
    See golang/go#37436 for context.
    flokli committed Apr 2, 2020
    Copy the full SHA
    da2146d View commit details
  10. ceph: 14.2.7 -> 14.2.8

    srhb committed Apr 2, 2020
    Copy the full SHA
    ec21f70 View commit details
  11. Copy the full SHA
    6ccd347 View commit details
  12. Merge pull request #83689 from flokli/go-1.14.1

    go_1_14: 1.14 -> 1.14.1
    Mic92 authored Apr 2, 2020
    Copy the full SHA
    d7f86b3 View commit details
  13. Merge pull request #83658 from Emantor/topic/kernel-snd-ca0132

    linux config: enable Creative Soundblaster DSP loading
    flokli authored Apr 2, 2020
    Copy the full SHA
    35916a8 View commit details

Commits on Apr 3, 2020

  1. Copy the full SHA
    be7bf5a View commit details
  2. Copy the full SHA
    a5f77d6 View commit details
  3. Copy the full SHA
    da8ca2b View commit details
  4. php: Build an even slimmer base

    This moves yet more extensions from the base build to
    phpPackages.ext. Some of the extensions are a bit quirky and need
    patching for this to work, most notably mysqlnd and opcache.
    
    Two new parameters are introduced for mkExtension - internalDeps and
    postPhpize. internalDeps is used to specify which other internal
    extensions the current extension depends on, in order to provide them
    at build time. postPhpize is for when patches and quirks need to be
    applied after running phpize.
    
    Patch notes:
    
    - For opcache, older versions of PHP have a bug where header files are
      included in the wrong order.
    
    - For mysqlnd, the config.h is never included, so we include it in the
      main header file, mysqlnd.h. Also, the configure script doesn't add
      the necessary library link flags, so we add them to the variable
      configure should have added them to.
    talyz authored and etu committed Apr 3, 2020
    Copy the full SHA
    2823377 View commit details
  5. phpPackages.exts: Run tests by default

    The tests for many of the extensions run just fine, for some a small
    portion fail. This runs the tests by default and disables the tests
    extensions with any failing tests.
    talyz authored and etu committed Apr 3, 2020
    Copy the full SHA
    6c810c2 View commit details
  6. php: Make buildEnv recursive + take extension deps into account

    A slight rewrite of buildEnv which:
    
    1. Makes buildEnv recursively add itself to its output, so that it can
       be accessed from any php derivation.
    
    2. Orders the extension text strings according to their internalDeps
       attribute - dependencies have to be put before dependants in the
       php.ini or they will fail to load due to missing symbols.
    talyz authored and etu committed Apr 3, 2020
    Copy the full SHA
    8924a7d View commit details
  7. gomuks: 2020-02-19 -> 2020-03-20

    Add a .desktop file to the output.
    ehmry committed Apr 3, 2020
    Copy the full SHA
    e1d2441 View commit details
  8. Copy the full SHA
    498914e View commit details
  9. Copy the full SHA
    edaa972 View commit details
  10. Copy the full SHA
    e3bdd6f View commit details
  11. itstool: fix double-shebang issue on macOS

    burke authored and FRidh committed Apr 3, 2020
    Copy the full SHA
    da7ac56 View commit details
  12. Copy the full SHA
    2bec129 View commit details
  13. graphite2: 1.3.13 -> 1.3.14

    r-ryantm authored and FRidh committed Apr 3, 2020
    Copy the full SHA
    bcd9b9b View commit details
  14. pythonPackages.click: 7.0 -> 7.1.1

    peterhoeg authored and FRidh committed Apr 3, 2020
    Copy the full SHA
    4588e6a View commit details
  15. maestral: 0.6.1 -> 0.6.3

    peterhoeg authored and FRidh committed Apr 3, 2020
    Copy the full SHA
    022ebea View commit details
Loading