Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pcsc-lite-not-found - alioth.debian.org decommissioned: #41790

Merged
merged 2 commits into from Jun 10, 2018
Merged

pcsc-lite-not-found - alioth.debian.org decommissioned: #41790

merged 2 commits into from Jun 10, 2018

Conversation

ookhoi
Copy link
Contributor

@ookhoi ookhoi commented Jun 10, 2018

https://reproducible-builds.org/blog/posts/162/

Motivation for this change

"The deprecated Alioth Debian server is now gone and has been replaced with Salsa"

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@ookhoi ookhoi mentioned this pull request Jun 10, 2018
Closed
8 tasks
@matthewbauer matthewbauer merged commit aa18847 into NixOS:master Jun 10, 2018
@bhipple
Copy link
Contributor

bhipple commented Jun 11, 2018 •
edited

In the staging branch, we fixed this by continuing to track Debian over at their new gitlab location: c256347

Either way is probably fine, but this likely going to cause a merge conflict on staging -> master. The ticket for the other resolutions on this is here.

@ookhoi
Copy link
Contributor Author

ookhoi commented Jun 11, 2018

@bhipple I can see why with Debian patches involved, but in this case I think it is better to use the actual source location. What is your opinion on that?

Up till now I did PRs on master and release-18.03. I tried to find a guide on the purpose of staging and how to do proper PRs. Would you be able to point me to such a guide?

@bhipple
Copy link
Contributor

bhipple commented Jun 11, 2018

Indeed, the actual source location is preferable, provided that it's reliably up. I actually didn't know about the upstream URL so I just followed debian from A -> B, but I'll submit a PR to the staging branch to swap it to your commit.

When a low-level package changes, Nix has to rebuild hundreds of other packages; this uses a lot of resources on the build farm, but also means users have to essentially re-download their system, since everything gets rebuilt. To avoid wasting CPU/space/bandwidth for everyone, we have the staging branch, which batches several large changes and gets merged when stable into master, so that we have fewer universe rebuilds. It also allows us to incubate changes that may break other packages, and avoid exposing them to users of master until it's good to go.

bhipple added a commit to bhipple/nixpkgs that referenced this pull request Jun 11, 2018
@bhipple
pcsclite: use canonical src url
ea3df42 
As pointed out by @ookhoi in NixOS#41790,
there's a standard upstream URL that we should be using instead of the debian
mirror.

This is a better fix than the initial one merged in c256347.
@bhipple bhipple mentioned this pull request Jun 11, 2018
Closed
8 tasks
@ookhoi
Copy link
Contributor Author

ookhoi commented Jun 12, 2018

Good to know, thanks!

orivej added a commit that referenced this pull request Jun 12, 2018
@orivej
Revert "pcsclite: fix URL for debian move to gitlab"
2ed34da 
This reverts commit c256347 on staging.

The issue was fixed on master in #41790 (aa18847)

Closes #41869
orivej added a commit that referenced this pull request Jun 12, 2018
@orivej
pcsclite: clean up after #41790
4d5565e
orivej added a commit that referenced this pull request Jun 12, 2018
@orivej
Merge branch 'master' into staging
7f3de60 
* master: (161 commits)
  pcsclite: clean up after #41790
  tor: 0.3.3.6 -> 0.3.3.7
  opae: init at 1.0.0
  tinc: 1.0.33 -> 10.0.34
  tinc_pre: 1.1pre15 -> 1.1pre16
  sit: 0.3.2 -> 0.4.0 (#41863)
  platforms/raspberrypi: enable kernelAutoModules
  libupnp: 1.6.21 -> 1.8.3 (#41684)
  androidStudioPackages.{dev,canary}: 3.2.0.16 -> 3.2.0.17
  tdesktop: 1.3.0 -> 1.3.7
  gns3Packages.{server,gui}{Stable,Preview}: 2.1.6 -> 2.1.7
  aws-sam-cli: init at 0.3.0 (#41877)
  nixos/nat: optional networking.nat.externalInterface (#41864)
  linux: 4.17 -> 4.17.1
  linux: 4.16.14 -> 4.16.15
  linux: 4.14.48 -> 4.14.49
  nixos/unbound: add restart (#41885)
  maintainers/create-azure.sh: remove hydra.nixos.org as binary cache (#41883)
  gshogi: init at 0.5.1 (#41840)
  neovim: add missing libiconv
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ookhoi @bhipple @matthewbauer @GrahamcOfBorg