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: d7d89c5eac7b
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: 4a753f75dbbb
Choose a head ref
  • 11 commits
  • 6 files changed
  • 5 contributors

Commits on Apr 30, 2019

  1. Copy the full SHA
    b077fe4 View commit details
  2. flrig: 1.3.42 -> 1.3.43

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/flrig/versions
    r-ryantm committed Apr 30, 2019
    Copy the full SHA
    3a7e2e9 View commit details
  3. Copy the full SHA
    29839c3 View commit details
  4. geany: 1.34.1 -> 1.35

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/geany/versions
    r-ryantm committed Apr 30, 2019
    Copy the full SHA
    ffebeb9 View commit details
  5. ginac: 1.7.5 -> 1.7.6

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/ginac/versions
    r-ryantm committed Apr 30, 2019
    Copy the full SHA
    1d663a6 View commit details
  6. fllog: 1.2.5 -> 1.2.6

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/fllog/versions
    r-ryantm authored and Lassulus committed Apr 30, 2019
    Copy the full SHA
    0604166 View commit details

Commits on May 1, 2019

  1. Merge pull request #60544 from angristan/nodejs-11_x/v11.15.0

    nodejs-11_x: 11.14.0 -> 11.15.0
    marsam authored May 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4a7e6f3 View commit details
  2. Merge pull request #60550 from r-ryantm/auto-update/ginac

    ginac: 1.7.5 -> 1.7.6
    ryantm authored May 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1496596 View commit details
  3. Merge pull request #60547 from r-ryantm/auto-update/geany

    geany: 1.34.1 -> 1.35
    ryantm authored May 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    abea632 View commit details
  4. Merge pull request #60532 from r-ryantm/auto-update/flrig

    flrig: 1.3.42 -> 1.3.43
    ryantm authored May 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b93b924 View commit details
  5. Merge pull request #60528 from edef1c/solvespace-2.3-20190422

    solvespace: 2.3-20180906 -> 2.3-20190422
    edef1c authored May 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4a753f7 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/editors/geany/default.nix
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
with stdenv.lib;

let
version = "1.34.1";
version = "1.35";
in

stdenv.mkDerivation rec {
name = "geany-${version}";

src = fetchurl {
url = "https://download.geany.org/${name}.tar.bz2";
sha256 = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11";
sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim";
};

nativeBuildInputs = [ pkgconfig intltool libintl ];
21 changes: 4 additions & 17 deletions pkgs/applications/graphics/solvespace/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,13 @@
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "solvespace-2.3-20180906";
rev = "258545a334098cf25c1c9f4cd59b778dfe0b0d29";
name = "solvespace-2.3-20190422";
rev = "fa6622903010eb82b07b16adf06d31d5ffcd6bb9";

src = fetchgit {
url = https://github.com/solvespace/solvespace;
inherit rev;
sha256 = "1wimh6l0zpk0vywcsd2minijjf6g550z8i3l8lpmfnl5przymc2v";
sha256 = "144w5l8cc5cpzqm6hjdp98a5k08whska1hmvwnz0c7glfji4z4dk";
fetchSubmodules = true;
};

@@ -22,20 +23,6 @@ stdenv.mkDerivation rec {
];
enableParallelBuilding = true;

preConfigure = ''
patch CMakeLists.txt <<EOF
@@ -20,9 +20,9 @@
# NOTE TO PACKAGERS: The embedded git commit hash is critical for rapid bug triage when the builds
# can come from a variety of sources. If you are mirroring the sources or otherwise build when
# the .git directory is not present, please comment the following line:
-include(GetGitCommitHash)
+# include(GetGitCommitHash)
# and instead uncomment the following, adding the complete git hash of the checkout you are using:
-# set(GIT_COMMIT_HASH 0000000000000000000000000000000000000000)
+set(GIT_COMMIT_HASH $rev)
EOF
'';

postInstall = ''
substituteInPlace $out/share/applications/solvespace.desktop \
--replace /usr/bin/ $out/bin/
4 changes: 2 additions & 2 deletions pkgs/applications/radio/fllog/default.nix
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@
}:

stdenv.mkDerivation rec {
version = "1.2.5";
version = "1.2.6";
pname = "fllog";
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://sourceforge/fldigi/${name}.tar.gz";
sha256 = "042j1g035338vfbl4i9laai8af8iakavar05xn2m4p7ww6x76zzl";
sha256 = "18nwqbbg5khpkwlr7dn41g6zf7ms2wzxykd42fwdsj4m4z0ysyyg";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/radio/flrig/default.nix
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@
}:

stdenv.mkDerivation rec {
version = "1.3.42";
version = "1.3.43";
pname = "flrig";

src = fetchurl {
url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
sha256 = "10qn710ms145zq2xzb6z2fnygxmh5pmfmyfdbphrc7mrvd0phzp0";
sha256 = "1ir47svjbz7dhgzxvb3xqnkcsnjqb935vhqfddx7yhaawiqrzhk1";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/ginac/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }:

stdenv.mkDerivation rec {
name = "ginac-1.7.5";
name = "ginac-1.7.6";

src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "11v8dpdfq8ybbbadyakp19xc7jgckplbbj6q2hh1c2hj5ps6njz7";
sha256 = "03cq93qjfgxgr7zxadrjfbn43lk5f0x2lmd90ggx10p6jq47157v";
};

propagatedBuildInputs = [ cln ];
4 changes: 2 additions & 2 deletions pkgs/development/web/nodejs/v11.nix
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "11.14.0";
sha256 = "1rvdyvlvh8ddm9y2razshly5kb87kw0js287i0a5dzb5ay41vxlx";
version = "11.15.0";
sha256 = "68a776c5d8b8b91a8f2adac2ca4ce4390ae1804883ec7ec9c0d6a6a64d306a76";
}