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: 1658beb6a13c
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: d0ec32c4fd12
Choose a head ref
  • 6 commits
  • 5 files changed
  • 5 contributors

Commits on Oct 8, 2019

  1. python37Packages.ed25519: 1.4 -> 1.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-ed25519/versions
    @r-ryantm
    r-ryantm committed Oct 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0192972 View commit details

Commits on Oct 12, 2019

  1. visualvm update homepage

    @moaxcp
    moaxcp committed Oct 12, 2019
    Copy the full SHA
    0811095 View commit details

  2. Merge pull request #70725 from r-ryantm/auto-update/python3.7-ed25519 

    python37Packages.ed25519: 1.4 -> 1.5
    @marsam
    marsam authored Oct 12, 2019
    Copy the full SHA
    9d14040 View commit details

  3. Merge pull request #71010 from moaxcp/visualvm 

    visualvm update homepage
    @marsam
    marsam authored Oct 12, 2019
    Copy the full SHA
    514968f View commit details

  4. ocamlPackages.ocaml-monadic: init at 0.4.1

    @vbgl
    vbgl committed Oct 12, 2019
    Copy the full SHA
    632f698 View commit details

  5. Partially revert "busybox: fix musl builds" 

    Original commit 5ba8c04 destroyed the meaning
of the *overridable* flag, and incidentally we were
relying on it in channel-critical stuff:
https://hydra.nixos.org/build/102298542
    @vcunat
    vcunat committed Oct 12, 2019
    Copy the full SHA
    d0ec32c View commit details
25 changes: 25 additions & 0 deletions pkgs/development/ocaml-modules/ocaml-monadic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ lib, fetchFromGitHub, buildDunePackage
, ocaml-migrate-parsetree, ppx_tools_versioned
}:

buildDunePackage rec {
pname = "ocaml-monadic";
version = "0.4.1";

src = fetchFromGitHub {
owner = "zepalmer";
repo = pname;
rev = version;
sha256 = "1zcwydypk5vwfn1g7srnl5076scwwq5a5y8xwcjl70pc4cpzszll";
};

buildInputs = [ ppx_tools_versioned ];
propagatedBuildInputs = [ ocaml-migrate-parsetree ];

meta = {
inherit (src.meta) homepage;
description = "A PPX extension to provide an OCaml-friendly monadic syntax";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ed25519/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "ed25519";
version = "1.4";
version = "1.5";

src = fetchPypi {
inherit pname version;
sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182";
};

meta = with stdenv.lib; {
2 changes: 1 addition & 1 deletion pkgs/development/tools/java/visualvm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
capability of monitoring and performance analysis for the Java
SE platform.
'';
homepage = https://visualvm.java.net/;
homepage = "https://visualvm.github.io";
license = licenses.gpl2ClasspathPlus;
platforms = platforms.all;
maintainers = with maintainers; [ michalrus moaxcp ];
6 changes: 6 additions & 0 deletions pkgs/os-specific/linux/busybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ stdenv, lib, buildPackages, fetchurl
, enableStatic ? false
, enableMinimal ? false
# Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping:
# nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist
, useMusl ? stdenv.hostPlatform.libc == "musl", musl
, extraConfig ? ""
}:
@@ -88,6 +90,10 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';

postConfigure = lib.optionalString (useMusl && stdenv.hostPlatform.libc != "musl") ''
makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
'';

depsBuildBuild = [ buildPackages.stdenv.cc ];

buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];
2 changes: 2 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -519,6 +519,8 @@ let

ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };

ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { };

ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };

ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };