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: f75784a33bd8
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: fb5517f5c9e3
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on May 11, 2020

  1. libfm: fix duplicate inclusion of libfm-extra 

    (cherry picked from commit f5c0535)
    @wamserma
    wamserma committed May 11, 2020
    Copy the full SHA
    02d2ab3 View commit details

  2. Merge pull request #87604 from wamserma/libfm-fix-collision-backport 

    libfm: fix duplicate inclusion of libfm-extra
    @ttuegel
    ttuegel authored May 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    da7ddd8 View commit details

Commits on May 12, 2020

  1. lib.version: change pre-git to post-git on the release branch 

    When there is no .version-suffix file in nixpkgs (like when fetching
nixpkgs with builtins.fetchGit), lib.version suffixes the version string
with "pre-git". The "pre" bit is special cased in
builtins.compareVersions which means "20.03pre-git" is interpreted as
"less than 20.03". This is clearly wrong for the release-20.03 branch
*after* the release has been made.

Change the suffix to "post-git" to make code like this behave the same
whether nixpkgs is fetched from git or the channel (which has
.version-suffix file):

  lib.versionOlder lib.version "20.03"
  lib.versionAtLeast lib.version "20.03"

(Currently the result depend on how nixpkgs was obtained!)

This change should be made part of the release process.
    @bjornfor
    bjornfor committed May 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d2a2ec2 View commit details

  2. clipman: 1.5.1 -> 1.5.2 

    https://github.com/yory8/clipman/releases/tag/v1.5.2
(cherry picked from commit ebeea74)
    @Ma27
    Ma27 committed May 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb5517f View commit details
Showing with 8 additions and 3 deletions.
  1. +1 −1 lib/trivial.nix
  2. +5 −0 pkgs/development/libraries/libfm/default.nix
  3. +2 −2 pkgs/tools/misc/clipman/default.nix
2 changes: 1 addition & 1 deletion lib/trivial.nix
View file
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ rec {
let suffixFile = ../.version-suffix;
in if pathExists suffixFile
then lib.strings.fileContents suffixFile
else "pre-git";
else "post-git";

/* Attempts to return the the current revision of nixpkgs and
returns the supplied default value otherwise.
5 changes: 5 additions & 0 deletions pkgs/development/libraries/libfm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
"sysconfdir=${placeholder "out"}/etc"
];

# libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
postInstall = optional (!extraOnly) ''
rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/misc/clipman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule rec {
pname = "clipman";
version = "1.5.1";
version = "1.5.2";

src = fetchFromGitHub {
owner = "yory8";
repo = pname;
rev = "v${version}";
sha256 = "09qvd7p63y7kh2i22pc89kr5wdnsbkraj5az9ds3bp3yj4q2mfyn";
sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n";
};

modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij";