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: aae0cc8a6e9c
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: 5709214f80f7
Choose a head ref
  • 20 commits
  • 12 files changed
  • 14 contributors

Commits on Apr 10, 2020

  1. build-bazel-package: fix linkopt flags

    These values were incorrect. We need to use NIX_LDFLAGS, not
    NIX_LD_FLAGS. Also need to prefix all flags with -Wl, for GCC to
    accept it.
    matthewbauer committed Apr 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    184cd9f View commit details

Commits on Apr 11, 2020

  1. php.extensions.pdo_mysql: Set default socket location

    Set the default socket location to match the one used by the MySQL
    module, so PHP programs using pdo_mysql don't have to specify this
    themselves.
    talyz committed Apr 11, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    d85bf2f View commit details
  2. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    52e8594 View commit details
  3. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    fd6ee37 View commit details
  4. zoneminder: 1.34.3 -> 1.34.9

    Also removed workaround which was included in ZoneMinder/zoneminder#2867
    danielfullmer committed Apr 11, 2020
    Copy the full SHA
    fae01fa View commit details
  5. megacmd: 1.1.0 -> 1.2.0

    bcc32 authored Apr 11, 2020
    Copy the full SHA
    d06f368 View commit details
  6. starship: 0.39.0 -> 0.40.0

    bbigras committed Apr 11, 2020
    Copy the full SHA
    83a0ed4 View commit details
  7. amber: 0.5.3 -> 0.5.4

    r-ryantm committed Apr 11, 2020
    Copy the full SHA
    b980e3e View commit details
  8. Merge pull request #84993 from talyz/pdo_mysql_socket

    php.extensions.pdo_mysql: Set default socket location
    etu authored Apr 11, 2020
    Copy the full SHA
    61ab265 View commit details
  9. Merge pull request #85015 from bbigras/starship

    starship: 0.39.0 -> 0.40.0
    garbas authored Apr 11, 2020
    Copy the full SHA
    ac2f730 View commit details
  10. Merge pull request #85014 from bcc32/patch-1

    megacmd: 1.1.0 -> 1.2.0
    garbas authored Apr 11, 2020
    Copy the full SHA
    4f8ca44 View commit details
  11. Merge pull request #84933 from matthewbauer/fix-bazel-copts

    build-bazel-package: fix linkopt flags
    matthewbauer authored Apr 11, 2020
    Copy the full SHA
    9ef6f1a View commit details
  12. Merge pull request #85011 from danielfullmer/zoneminder-1.34.9

    zoneminder: 1.34.3 -> 1.34.9
    garbas authored Apr 11, 2020
    Copy the full SHA
    dc75767 View commit details
  13. python.pkgs.tensorflow-probability: 0.7 -> 0.8.0

    This unbreaks the build by updating to a newer version, adding new
    dependencies and backporting some patches.
    
    0.9 is released already, but that version is no longer compatible with
    tf1. 0.8.0 is compatible with tf1 and tf2.
    timokau committed Apr 11, 2020
    Copy the full SHA
    04d3adb View commit details
  14. python.pkgs.arviz: 0.6.1 -> 0.7.0

    Fixes a test failure that was caused by the numba update in
    4362401.
    timokau committed Apr 11, 2020
    Copy the full SHA
    346197e View commit details
  15. python3.pkgs.pymc3: unbreak

    The arviz and packaging dependencies are needed since the update to
    pymc3 3.8.
    timokau committed Apr 11, 2020
    Copy the full SHA
    b7b33e2 View commit details
  16. Merge pull request #85007 from nh2/git-bug-0.7.1

    gitAndTools.git-bug: 0.6.0 -> 0.7.0
    Mic92 authored Apr 11, 2020
    Copy the full SHA
    ae4b71e View commit details
  17. Merge pull request #85027 from timokau/pymc3-unbreak

    python3.pkgs.pymc3: unbreak; update arviz, tensorflow-probability
    timokau authored Apr 11, 2020
    Copy the full SHA
    8febf8b View commit details
  18. Merge pull request #84979 from doronbehar/improve-nerd-fonts

    nerdfonts: update.sh: use releases api to generate shas
    marsam authored Apr 11, 2020
    Copy the full SHA
    eb54aa1 View commit details
  19. Merge pull request #85016 from r-ryantm/auto-update/amber

    amber: 0.5.3 -> 0.5.4
    ryantm authored Apr 11, 2020
    Copy the full SHA
    5709214 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/megacmd/default.nix
Original file line number Diff line number Diff line change
@@ -22,13 +22,13 @@

stdenv.mkDerivation rec {
pname = "megacmd";
version = "1.1.0";
version = "1.2.0";

src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAcmd";
rev = "${version}_Linux";
sha256 = "004j8m3xs6slx03g2g6wzr97myl2v3zc09wxnfar5c62a625pd53";
sha256 = "0czyhsms0a0237d6h9b21n9p4nm4zkjanhhbvw26k6266g6c1nyr";
fetchSubmodules = true;
};

Original file line number Diff line number Diff line change
@@ -2,21 +2,21 @@

buildGoModule rec {
pname = "git-bug";
version = "0.7.0";
rev = "71580c41a931a1ad2c04682e0fd701661b716c95";
version = "0.7.1"; # the `rev` below pins the version of the source to get
rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c";
goPackagePath = "github.com/MichaelMure/git-bug";

src = fetchFromGitHub {
inherit rev;
owner = "MichaelMure";
repo = "git-bug";
sha256 = "0mhqvcwa6y3hrrv88vbp22k7swzr8xw6ipm80gdpx85yp8j2wdkh";
sha256 = "01ab3mlwh5g1vr3x85fppflg18gb8ip9mjfsp2b5rfigd9lxyyns";
};

modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld";
modSha256 = "05wxvzsbhvz15596019vs7h09kynfsfjx3i5xyrl5xjzdxbaqbrq";

buildFlagsArray = ''
-ldflags=
-ldflags=
-X ${goPackagePath}/commands.GitCommit=${rev}
-X ${goPackagePath}/commands.GitLastTag=${version}
-X ${goPackagePath}/commands.GitExactTag=${version}
6 changes: 3 additions & 3 deletions pkgs/build-support/build-bazel-package/default.nix
Original file line number Diff line number Diff line change
@@ -181,9 +181,9 @@ in stdenv.mkDerivation (fBuildAttrs // {
done
linkopts=()
host_linkopts=()
for flag in $NIX_LD_FLAGS; do
linkopts+=( "--linkopt=$flag" )
host_linkopts+=( "--host_linkopt=$flag" )
for flag in $NIX_LDFLAGS; do
linkopts+=( "--linkopt=-Wl,$flag" )
host_linkopts+=( "--host_linkopt=-Wl,$flag" )
done
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
3 changes: 3 additions & 0 deletions pkgs/data/fonts/nerdfonts/shas.nix
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@
"iA-Writer" = "0clksrxw6xcv5c1pbd8rl2rc3r15iak1qv8v6bn0j2mccjcss64z";
"IBMPlexMono" = "0xkfkpnkkrvjfiv624l7lpmfji107y7645w6ah47ijyg47yxkmsg";
"Inconsolata" = "14gbwc0k3d1j496w6pv9kry1pglswzd0armsdb0g1mqgzfdf1ci1";
"InconsolataGo" = "0c6yhx242d82dalyjas42qniy0jagqs47cfsfarwmzar6zg3lj5m";
"InconsolataLGC" = "1746nl1rz4hscfgbmd8642wq3z1wizvfjb50y3yyjsc1ixc1f0pd";
"Iosevka" = "1qqd4xh98vxb99rh2a2qv9gjclilhaw84pyqdpbx225qhvw9xlkb";
"JetBrainsMono" = "1kc8fyk1aczxkmn8dzv1gy6xfi2jywgahd8np576v2dn8kx16844";
"Lekton" = "0mny5j9bns9104wg2wmabdw0sl80c7i3dzp4j5mxh8jybx929d3i";
@@ -45,5 +47,6 @@
"Terminus" = "0g2ybs225fwxmvwfnanc32jc2lfnag3agmliv1vrb5mxyqzm53gj";
"Tinos" = "077n4k6yh4qbirfkl02zqn3057kymspr10zcbfkf4ldvifa36pjd";
"Ubuntu" = "1lzdrgb8vk5dwicxhvkgbain5phf88g3zgv5ya2ihh052xsl3qih";
"UbuntuMono" = "0wa8ri7f3g8vwd194q812qh8nzplnmhl5ak0yhgilmm44s46ad0h";
"VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q";
}
74 changes: 11 additions & 63 deletions pkgs/data/fonts/nerdfonts/update.sh
Original file line number Diff line number Diff line change
@@ -1,73 +1,21 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p rsstail nix-prefetch
#! nix-shell -i bash -p nix-prefetch jq

# NOTE: Before running this script, please make sure this list is up-to-date -
# meaning there are no new fonts they provide at https://github.com/ryanoasis/nerd-fonts/releases/
fonts=(
"3270"
Agave
AnonymousPro
Arimo
AurulentSansMono
BigBlueTerminal
BitstreamVeraSansMono
CascadiaCode
CodeNewRoman
Cousine
DaddyTimeMono
DejaVuSansMono
DroidSansMono
FantasqueSansMono
FiraCode
FiraMono
Go-Mono
Gohu
Hack
Hasklig
HeavyData
Hermit
iA-Writer
IBMPlexMono
Inconsolata
Iosevka
JetBrainsMono
Lekton
LiberationMono
Meslo
Monofur
Monoid
Mononoki
MPlus
Noto
OpenDyslexic
Overpass
ProFont
ProggyClean
RobotoMono
ShareTechMono
SourceCodePro
SpaceMono
Terminus
Tinos
Ubuntu
VictorMono
)

releases_url="https://github.com/ryanoasis/nerd-fonts/releases.atom"

version="$(rsstail -1 -u "$releases_url" -H -l -r | sed -e '/^Title: /d' -e 's:.*/::' -e 's/^v//g' | sort -V | tail -1)"

echo Using version "$version"
latest_release=$(curl --silent https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest)
version=$(jq -r '.tag_name' <<<"$latest_release")

dirname="$(dirname "$0")"
echo \""$version"\" > "$dirname/version.nix"
echo \""${version#v}"\" >"$dirname/version.nix"

base_url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}"
echo Using version "$version"

printf '{\n' > "$dirname/shas.nix"

for font in "${fonts[@]}"; do
printf '\t"%s" = "%s";\n' "$font" "$(nix-prefetch-url "${base_url}/${font}.zip")" >> "$dirname/shas.nix"
done
while
read -r name
read -r url
do
printf '\t"%s" = "%s";\n' "${name%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix"
done < <(jq -r '.assets[] | .name, .browser_download_url' <<<"$latest_release")

printf '}\n' >> "$dirname/shas.nix"
18 changes: 14 additions & 4 deletions pkgs/development/python-modules/arviz/default.nix
Original file line number Diff line number Diff line change
@@ -22,13 +22,13 @@

buildPythonPackage rec {
pname = "arviz";
version = "0.6.1";
version = "0.7.0";

src = fetchFromGitHub {
owner = "arviz-devs";
repo = "arviz";
rev = version;
sha256 = "1qc4piz18hfik32gj4v65ckwv516mppq2ac0jyqs21lhqfwbgv9w";
sha256 = "03hj7bkkj6kfqdk6ri2mp53wk4k7xpafxk01vgs6k9zg3rlnq7ny";
};

propagatedBuildInputs = [
@@ -69,8 +69,18 @@ buildPythonPackage rec {
# data_numpyro, data_pyro, data_pystan, and plots.
checkPhase = ''
cd arviz/tests/
HOME=$TMPDIR pytest test_{data_cmdstan,data_emcee,data,data_tfp,\
diagnostics,plot_utils,rcparams,stats,stats_utils,utils}.py
export HOME=$TMPDIR
pytest \
base_tests/test_data.py \
base_tests/test_diagnostics.py \
base_tests/test_plot_utils.py \
base_tests/test_rcparams.py \
base_tests/test_stats.py \
base_tests/test_stats_utils.py \
base_tests/test_utils.py \
external_tests/test_data_cmdstan.py \
external_tests/test_data_emcee.py \
external_tests/test_data_tfp.py
'';

meta = with lib; {
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/pymc3/default.nix
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@
, tqdm
, six
, h5py
, arviz
, packaging
, pytest
, nose
, parameterized
@@ -37,6 +39,8 @@ buildPythonPackage rec {
tqdm
six
h5py
arviz
packaging
];

checkInputs = [
28 changes: 24 additions & 4 deletions pkgs/development/python-modules/tensorflow-probability/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{ lib
, fetchFromGitHub
, fetchpatch
, buildBazelPackage
, buildPythonPackage
, python
, setuptools
, wheel
, absl-py
, tensorflow
, six
, numpy
, decorator
, cloudpickle
, gast
, hypothesis
, scipy
, matplotlib
@@ -18,7 +21,7 @@
}:

let
version = "0.7";
version = "0.8.0";
pname = "tensorflow_probability";

# first build all binaries and generate setup.py using bazel
@@ -28,21 +31,37 @@ let
src = fetchFromGitHub {
owner = "tensorflow";
repo = "probability";
rev = "v${version}";
sha256 = "0sy9gmjcvmwciamqvd7kd9qw2wd7ksklk80815fsn7sj0wiqxjyd";
rev = "${version}";
sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy";
};

patches = [
(fetchpatch {
name = "gast-0.3.patch";
url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch";
sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a";
excludes = ["testing/*"];
})
(fetchpatch {
name = "cloudpickle-1.2.patch";
url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch";
sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga";
})
];

nativeBuildInputs = [
# needed to create the output wheel in installPhase
python
setuptools
wheel
absl-py
tensorflow
];

bazelTarget = ":pip_pkg";

fetchAttrs = {
sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx";
};

buildAttrs = {
@@ -75,6 +94,7 @@ in buildPythonPackage {
numpy
decorator
cloudpickle
gast
];

# Listed here:
8 changes: 2 additions & 6 deletions pkgs/servers/zoneminder/default.nix
Original file line number Diff line number Diff line change
@@ -78,13 +78,13 @@ let

in stdenv.mkDerivation rec {
pname = "zoneminder";
version = "1.34.3";
version = "1.34.9";

src = fetchFromGitHub {
owner = "ZoneMinder";
repo = "zoneminder";
rev = version;
sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0";
sha256 = "1xvgfsm260a3v0vqgbk7m9jzayhcs4ysyadnnxajyrndjhn802ic";
};

patches = [
@@ -170,10 +170,6 @@ in stdenv.mkDerivation rec {
"-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
"-DZM_WEB_USER=${user}"
"-DZM_WEB_GROUP=${user}"

# Workaround issue in CMakeLists.txt where ZM_CGIDIR set to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin
# But CMAKE_INSTALL_LIBEXECDIR is already an absolute path from cmake setup-hook
"-DZM_CGIDIR=${placeholder "out"}/libexec/zoneminder/cgi-bin"
];

passthru = { inherit dirName; };
6 changes: 3 additions & 3 deletions pkgs/tools/misc/starship/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.39.0";
version = "0.40.0";

src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "13phic9898wjc4b000nkwhy24yczn3dyhw8pqcaqhyzxdaj3gwmw";
sha256 = "11x5j91dank0zgxy1y5abhfymyzf3fpfvw6g1ll23vwxmspm8f4w";
};

nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
--replace "/bin/echo" "echo"
'';

cargoSha256 = "0ds19sjy0fd7psmqkw64scjf3ysi408i7c1qk9zvqkl4ghz8wymg";
cargoSha256 = "0z0k9nq6fjg30380yc1skdzw0mhfljhkpagm8mh5w9bz1bzyd45d";
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";

meta = with stdenv.lib; {
6 changes: 3 additions & 3 deletions pkgs/tools/text/amber/default.nix
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@

rustPlatform.buildRustPackage rec {
pname = "amber";
version = "0.5.3";
version = "0.5.4";

src = fetchFromGitHub {
owner = "dalance";
repo = pname;
rev = "v${version}";
sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx";
sha256 = "0pqz3spb5lmrj7w8hynmah9nrcfjsb1s0bmrr0cng9a9jx8amwzn";
};

cargoSha256 = "0g8n3r6bdsfl1417wnss3ggnv5ywz8mx53hjglshmln40552znh3";
cargoSha256 = "1ps70swh96xbfn4hng5krlmwvw2bwrl2liqvx9v9vy6pr86643s6";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

2 changes: 1 addition & 1 deletion pkgs/top-level/php-packages.nix
Original file line number Diff line number Diff line change
@@ -939,7 +939,7 @@ in
# pdo_firebird (7.4, 7.3, 7.2)
{ name = "pdo_mysql";
internalDeps = with php.extensions; [ pdo mysqlnd ];
configureFlags = [ "--with-pdo-mysql=mysqlnd" ];
configureFlags = [ "--with-pdo-mysql=mysqlnd" "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock" ];
doCheck = false; }
# pdo_oci (7.4, 7.3, 7.2)
{ name = "pdo_odbc";