Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 42f7db63ff04
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae2bdf2c1bd4
Choose a head ref
  • 14 commits
  • 19 files changed
  • 10 contributors

Commits on May 16, 2020

  1. mpd: use pkg-config instead of pkgconfig

    @doronbehar
    doronbehar committed May 16, 2020
    Copy the full SHA
    5a94a29 View commit details

  2. mpd: format inputs

    @doronbehar
    doronbehar committed May 16, 2020
    Copy the full SHA
    ecdbbdf View commit details

  3. mpd: enable tests

    @doronbehar
    doronbehar committed May 16, 2020
    Copy the full SHA
    69aa4f3 View commit details

  4. mpd: Build and install docs and split outputs

    @doronbehar
    doronbehar committed May 16, 2020
    Copy the full SHA
    08bdd8b View commit details

Commits on Jun 4, 2020

  1. thunderbird-bin: 68.8.1 -> 68.9.0

    @taku0
    taku0 committed Jun 4, 2020
    Copy the full SHA
    7f87a17 View commit details

  2. thunderbird: 68.8.1 -> 68.9.0

    @taku0
    taku0 committed Jun 4, 2020
    Copy the full SHA
    5967e4d View commit details

  3. gitlab: 12.10.8 -> 13.0.3 

    https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/
https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/
https://about.gitlab.com/releases/2020/05/29/gitlab-13-0-3-released/

The gitaly gitlab-shell config has moved into gitaly.toml. See
https://gitlab.com/gitlab-org/gitaly/-/issues/2182 for more info.
    @globin @talyz
    globin authored and talyz committed Jun 4, 2020
    Copy the full SHA
    79454f1 View commit details

  4. gitlab: 13.0.3 -> 13.0.4 

    https://about.gitlab.com/releases/2020/06/03/critical-security-release-13-0-4-released/
    @talyz
    talyz committed Jun 4, 2020
    Copy the full SHA
    0b5c534 View commit details

Commits on Jun 5, 2020

  1. Merge pull request #87949 from doronbehar/mpd-docs 

    mpd: enable tests + install docs + split outputs
    @marsam
    marsam authored Jun 5, 2020
    Copy the full SHA
    810f240 View commit details

  2. freecad: use wrapQtAppsHook

    josephtheengineer committed Jun 5, 2020
    Copy the full SHA
    4eaa5a0 View commit details

  3. Merge #89474: thunderbird*: 68.8.1 -> 68.9.0 (security)

    @vcunat
    vcunat committed Jun 5, 2020
    Copy the full SHA
    5a8cdcc View commit details

  4. Add {pkgsMusl,pkgsStatic}.stdenv to build on hydra (#89425) 

    * Add pkgsMusl.stdenv to block nixpkgs channel

* Don’t include i686-linux for pkgs{Musl,Static}

musl bootstrapping is unavailable for i686-linux right now. so we can
just exclude it from hydra.

Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
    @domenkozar @matthewbauer
    domenkozar and matthewbauer authored Jun 5, 2020
    Copy the full SHA
    fb6c3ce View commit details

  5. Merge pull request #89480 from talyz/gitlab-13 

    gitlab: 12.10.8 -> 13.0.4
    @globin
    globin authored Jun 5, 2020
    Copy the full SHA
    cc7eaae View commit details

  6. Merge pull request #89522 from josephtheengineer/freecad-wrapQtAppsHook 

    freecad: use wrapQtAppsHook
    @gebner
    gebner authored Jun 5, 2020
    Copy the full SHA
    ae2bdf2 View commit details
3 changes: 3 additions & 0 deletions nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -43,6 +43,9 @@ let
[gitlab-shell]
dir = "${cfg.packages.gitlab-shell}"
secret_file = "${cfg.statePath}/gitlab_shell_secret"
gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"
http_settings = { self_signed_cert = false }
${concatStringsSep "\n" (attrValues (mapAttrs (k: v: ''
[[storage]]
20 changes: 14 additions & 6 deletions pkgs/applications/graphics/freecad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, xercesc, ode
, eigen, qtbase, qttools, qtwebkit, opencascade-occt, gts, hdf5, vtk, medfile
, zlib, python3Packages, swig, gfortran, libXmu, soqt, libf2c, libGLU
, makeWrapper, pkgconfig, mpi ? null }:
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d,
xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook,
opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig,
gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }:

assert mpi != null;

@@ -18,8 +18,16 @@ in mkDerivation rec {
sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s";
};

nativeBuildInputs = [ cmake ninja pkgconfig pythonPackages.pyside2-tools ];
buildInputs = [ cmake coin3d xercesc ode eigen opencascade-occt gts
nativeBuildInputs = [
cmake
ninja
pkgconfig
pythonPackages.pyside2-tools
wrapQtAppsHook
];

buildInputs = [
cmake coin3d xercesc ode eigen opencascade-occt gts
zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile
libGLU libXmu qtbase qttools qtwebkit
] ++ (with pythonPackages; [
Loading