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: fb1c7bf633dc
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: bcb05f050e90
Choose a head ref
  • 9 commits
  • 7 files changed
  • 7 contributors

Commits on Apr 21, 2020

  1. nixos-shell: init at 0.1.1

    @Mic92
    Mic92 committed Apr 21, 2020
    Copy the full SHA
    f2a77c7 View commit details

Commits on May 23, 2020

  1. thunderbird-bin: 68.8.0 -> 68.8.1

    @taku0
    taku0 committed May 23, 2020
    Copy the full SHA
    6666113 View commit details

  2. thunderbird: 68.8.0 -> 68.8.1

    @taku0
    taku0 committed May 23, 2020
    Copy the full SHA
    a9a8ba3 View commit details

  3. ipget: 0.3.2 -> 0.6.0 

    https://github.com/ipfs/ipget/releases/tag/v0.6.0
    @Luflosi
    Luflosi committed May 23, 2020
    Copy the full SHA
    8e3c58d View commit details

Commits on May 24, 2020

  1. openscad: use wrapQtApp for macOS app

    @veprbl @bjornfor
    veprbl authored and bjornfor committed May 24, 2020
    Copy the full SHA
    e4cd1ba View commit details

  2. Merge pull request #85673 from Mic92/nixos-shell

    @Mic92
    Mic92 authored May 24, 2020
    Copy the full SHA
    9df4eba View commit details

  3. nix-bundle: 0.3 -> 0.4

    @matthewbauer @bjornfor
    matthewbauer authored and bjornfor committed May 24, 2020
    Copy the full SHA
    faa7ae8 View commit details

  4. Merge #88657: thunderbird*: 68.8.0 -> 68.8.1

    @vcunat
    vcunat committed May 24, 2020
    Copy the full SHA
    fa4e5b5 View commit details

  5. Merge pull request #87619 from Luflosi/update/ipget

    @Mic92
    Mic92 authored May 24, 2020
    Copy the full SHA
    bcb05f0 View commit details
2 changes: 2 additions & 0 deletions pkgs/applications/graphics/openscad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,8 @@ mkDerivation rec {
mv $out/bin/*.app $out/Applications
rmdir $out/bin || true
wrapQtApp "$out"/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD
mv --target-directory=$out/Applications/OpenSCAD.app/Contents/Resources \
$out/share/openscad/{examples,color-schemes,locale,libraries,fonts}
25 changes: 8 additions & 17 deletions pkgs/applications/networking/ipget/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "ipget";
version = "0.3.2";
rev = "v${version}";

goPackagePath = "github.com/ipfs/ipget";

extraSrcPaths = [
(fetchgx {
inherit src;name = "${pname}-${version}";
sha256 = "07l9hpkhk5phr95zp1l5wd3ii38bw91hy4dlw2rsfbzcsc8bq4s8";
})
];

goDeps = ../../../tools/package-management/gx/deps.nix;
version = "0.6.0";

src = fetchFromGitHub {
owner = "ipfs";
repo = "ipget";
inherit rev;
sha256 = "1ljf5ddvc1p5swmgn4m1ivfj74fykk56myk2r9c4grdjzksf4a15";
rev = "v${version}";
sha256 = "14ygij6hj6bd4g4aw6jgfbi1fgpal0jgf1hr22zxm16dpx3vva6b";
};

vendorSha256 = "0vy21pdqk6q5fw7wlcv51myhh9y79n2qhvy61rmblwhxlrkh6sdv";

meta = with stdenv.lib; {
description = "Retrieve files over IPFS and save them locally";
homepage = "https://ipfs.io/";
license = licenses.mit;
maintainers = with maintainers; [ Luflosi ];
platforms = platforms.unix;
};
}
Loading