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: e6d81a9b89e8
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: 363110efadef
Choose a head ref
  • 9 commits
  • 6 files changed
  • 8 contributors

Commits on Jul 13, 2020

  1. Copy the full SHA
    b096d8e View commit details

Commits on Jul 14, 2020

  1. moodle: 3.9.0 -> 3.9.1

    freezeboy committed Jul 14, 2020
    Copy the full SHA
    5f9de36 View commit details

Commits on Jul 15, 2020

  1. Copy the full SHA
    7f2c366 View commit details
  2. Copy the full SHA
    bcdb9a4 View commit details
  3. Merge pull request #93075 from raboof/sweethome3d-enable-java2d-opengl

    sweethome3d: improve performance by enabling OpenGL for java2d
    aanderse authored Jul 15, 2020
    Copy the full SHA
    a3efa87 View commit details
  4. Merge pull request #93111 from freezeboy/update-moodle

    moodle: 3.9.0 -> 3.9.1
    aanderse authored Jul 15, 2020
    Copy the full SHA
    30df4d9 View commit details
  5. Copy the full SHA
    5d1064a View commit details
  6. Merge pull request #93161 from cole-h/rm-tmp

    Remove tmp file from tarball job
    grahamc authored Jul 15, 2020
    Copy the full SHA
    ff42f46 View commit details
  7. Merge pull request #93170 from prusnak/bip-utils

    python3Packages.bip_utils: init at 1.0.5
    mmahut authored Jul 15, 2020
    Copy the full SHA
    363110e View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/sweethome3d/default.nix
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ let
patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
'';

buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings-desktop-schemas ];
buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ];

buildPhase = ''
ant furniture textures help
@@ -53,7 +53,7 @@ let
makeWrapper ${jre}/bin/java $out/bin/$exec \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"
--add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}"
'';

dontStrip = true;
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.34.3"; # Please backport all updates to the stable channel.
version = "1.34.4"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1723h8fwclv07n5lcsqw3snmfhpigkrj609fayg0aycxgi3321h6";
sha256 = "0250ys1lvfl417n8z9w3z6vqflzdlg0sff8l7wbzhv87nnc9kzg9";
};

nativeBuildInputs = [
32 changes: 32 additions & 0 deletions pkgs/development/python-modules/bip_utils/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, ecdsa
, pysha3
}:

buildPythonPackage rec {
pname = "bip_utils";
version = "1.0.5";

src = fetchPypi {
inherit pname version;
sha256 = "e8397a315c2f656ccf37ff1c43f5e0d496a10ea692c614fdf9bae1a3d5de3558";
};

propagatedBuildInputs = [ ecdsa pysha3 ];

# tests are not packaged in the released tarball
doCheck = false;

pythonImportsCheck = [
"bip_utils"
];

meta = {
description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation";
homepage = "https://github.com/ebellocchia/bip_utils";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ prusnak ];
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/moodle/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, writeText }:

let
version = "3.9";
version = "3.9.1";
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
in

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "1splsxdxzwf49zxrdb4q05fj60agqyzv0ikvk05gaf49qqd8rznz";
sha256 = "1ysnrk013gmc21ml3jwijvl16rx3p478a4vriy6h8hfli48460p9";
};

phpConfig = writeText "config.php" ''
1 change: 1 addition & 0 deletions pkgs/top-level/make-tarball.nix
Original file line number Diff line number Diff line change
@@ -108,6 +108,7 @@ releaseTools.sourceTarball {
echo -n '}' >> tmp
packages=$out/packages.json.br
< tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages
rm tmp
echo "file json-br $packages" >> $out/nix-support/hydra-build-products
'';
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -523,6 +523,8 @@ in {

biplist = callPackage ../development/python-modules/biplist { };

bip_utils = callPackage ../development/python-modules/bip_utils { };

bitarray = callPackage ../development/python-modules/bitarray { };

bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };