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

[staging]freeglut: 3.0.0 -> 3.2.1 #70235

Merged
merged 1 commit into from
Dec 8, 2019
Merged

[staging]freeglut: 3.0.0 -> 3.2.1 #70235

merged 1 commit into from
Dec 8, 2019
+2 −2

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 2, 2019 •
edited
Loading

Motivation for this change

follow up to #69531

includes a series of small installation fixes

closes #69531

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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Sorry, something went wrong.

@ofborg ofborg bot requested a review from bjornfor October 2, 2019 09:10
bjornfor
bjornfor approved these changes Oct 2, 2019
View reviewed changes
Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this fixed the problems with 3.2.0 (missing glut.h).

@jonringer
Copy link
Contributor Author

jonringer commented Oct 2, 2019 •
edited
Loading

correct,

[08:00:45] jon@jon-desktop /home/jon/projects/nixpkgs (bump-freeglut)
$ nix-build -A freeglut
/nix/store/l1zk7hsb247a6mxbji1qic0yx4k7ikm9-freeglut-3.2.1
[08:00:54] jon@jon-desktop /home/jon/projects/nixpkgs (bump-freeglut)
$ tree ./result-dev
./result-dev
├── include
│   └── GL
│       ├── freeglut_ext.h
│       ├── freeglut.h
│       ├── freeglut_std.h
│       └── freeglut_ucall.h
├── lib
│   ├── cmake
│   │   └── FreeGLUT
│   │       ├── FreeGLUTConfig.cmake
│   │       ├── FreeGLUTConfigVersion.cmake
│   │       ├── FreeGLUTTargets.cmake
│   │       └── FreeGLUTTargets-release.cmake
│   └── pkgconfig
│       └── glut.pc
└── nix-support
    └── propagated-build-inputs

EDIT: result-dev here points to 3.2.0 still.... disregard this comment xD

@jonringer jonringer changed the base branch from master to staging October 2, 2019 15:53
@jonringer jonringer changed the title freeglut: 3.0.0 -> 3.2.1 [staging]freeglut: 3.0.0 -> 3.2.1 Oct 2, 2019
@jonringer
Copy link
Contributor Author

moved base to staging, as this causes a fair number of rebuilds.

@ofborg ofborg bot requested a review from bjornfor October 2, 2019 16:05
@bjornfor
Copy link
Contributor

bjornfor commented Oct 2, 2019

In your example I don't see include/GL/glut.h, but when running it myself I do see it:

$ tree ./result-dev/include/
./result-dev/include/
└── GL
    ├── freeglut_ext.h
    ├── freeglut.h
    ├── freeglut_std.h
    ├── freeglut_ucall.h
    └── glut.h

1 directory, 5 files

Perhaps you did the same mistake as I (initially): one must run nix-build -A freeglut.all to get all outputs.

@jonringer
Copy link
Contributor Author

jonringer commented Oct 2, 2019 •
edited
Loading

I think I left off the part when I ran nix-build -A freeglut.dev

EDIT: Although, it's missing glut.h so i probably ran that on the other PR :( (3.2.0 outputs)

fixed output:

[10:29:04] jon@jon-workstation ~/projects/nixpkgs (bump-freeglut)
$ realpath ./result-dev
/nix/store/ng5ybj4dh2ra7xzjd1n86x9g7rnnh7cv-freeglut-3.2.1-dev
[10:29:29] jon@jon-workstation ~/projects/nixpkgs (bump-freeglut)
$ tree ./result-dev/include/
./result-dev/include/
└── GL
    ├── freeglut_ext.h
    ├── freeglut.h
    ├── freeglut_std.h
    ├── freeglut_ucall.h
    └── glut.h

1 directory, 5 files

@jonringer
Copy link
Contributor Author

jonringer commented Oct 2, 2019 •
edited
Loading

I'm running a review right now, just to make sure I don't cause any major breakages, could be a while though:

[8/83/1550 built (1 failed), 3311 copied (34372.0/34384.3 MiB), 11588.7 MiB DL]

:(

@jonringer
Copy link
Contributor Author 

[304 built (13 failed), 0.0 MiB DL]
error: build of '/nix/store/7f63414vblq7h3h8zhm5hzrzmb7vrxc6-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/70235
12 package are marked as broken and were skipped:
fakenes gazebo gazebo-headless gazeboSimulator.gazebo6 gazeboSimulator.gazebo6-headless gazeboSimulator.gazebo7 gazeboSimulator.gazebo7-headless hyper-haskell minc_widgets octave octaveFull python27Packages.spyder

50 package failed to build:
csound-qt digikam electricsheep haskellPackages.BigPixel haskellPackages.GLUT haskellPackages.Raincat haskellPackages.Shu-thing haskellPackages.UISF haskellPackages.apecs-gloss haskellPackages.apecs-physics-gloss haskellPackages.arcgrid-viewer haskellPackages.boring-game haskellPackages.dual-game haskellPackages.essence-of-live-coding-gloss haskellPackages.folgerhs haskellPackages.gearbox haskellPackages.gloss haskellPackages.gloss-accelerate haskellPackages.gloss-algorithms haskellPackages.gloss-examples haskellPackages.gloss-juicy haskellPackages.gloss-raster haskellPackages.gloss-rendering haskellPackages.gluturtle haskellPackages.handa-opengl haskellPackages.htdp-image haskellPackages.kafka-device-glut haskellPackages.learn-physics haskellPackages.life haskellPackages.not-gloss haskellPackages.opengl-dlp-stereo haskellPackages.opengl-spacenavigator haskellPackages.processing-for-haskell haskellPackages.rhine-gloss haskellPackages.snowglobe haskellPackages.tetris haskellPackages.twentefp kicad-unstable lutris lutris-free opencsg openscad pymol python27Packages.wxPython_4_0 python37Packages.rl-coach python37Packages.wxPython_4_0 qutebrowser soulseekqt vogl winswitch

179 package were build:
Sylk afterstep alsaTools appimage-run appleseed asymptote bicgl boinc box2d bullet bullet-roboschool bumblebee cegui celestia chipmunk cinepaint construo crack_attack crrcsim csound cubicsdr cups-filters curaByDagoma cura_stable dillo displaycal enblend-enfuse enlightenment.econnman enlightenment.efl enlightenment.enlightenment enlightenment.ephoto enlightenment.rage enlightenment.terminology eureka-editor exrdisplay extremetuxracer faust2csound fldigi fllog flmsg flpsed flrig fltk fltk14 fltrator flwrap freeglut freenect freepv giac-with-xcas gl117 gl2ps gle glsurf glui gmsh gnss-sdr gnuradio gnuradio-with-packages gqrx gr-ais gr-gsm gr-limesdr gr-nacl gr-osmosdr gr-rds grass haskellPackages.fltkhs haskellPackages.freenect hdaps-gl hugin icesl impressive inspectrum io irccloud ja2-stracciatella jfbpdf jfbview joplin-desktop jwm-settings-manager k2pdfopt kernelshark kicad kicad-with-packages3d ledger-live-desktop limesuite liquidwar llpp lmms loxodo lumina.lumina lush2 mednafen mednaffe metamorphose2 minetime mupdf navit newtonwars notable ogre ogre1_10 ogre1_9 ogrepaged opendungeons openmw openmw-tes3mp openrw osl partio paulstretch perl528Packages.OpenGL perl530Packages.OpenGL pfstools playonlinux plib plover.stable posterazor printrun purePackages.gl python27Packages.binwalk python27Packages.fipy python27Packages.pymupdf python27Packages.pyopengl python27Packages.pyqtgraph python27Packages.pyspread python27Packages.pythonefl python27Packages.robotframework-ride python27Packages.runsnakerun python27Packages.wxPython python37Packages.binwalk python37Packages.fipy python37Packages.pymupdf python37Packages.pyopengl python37Packages.pyqtgraph python37Packages.pythonefl python37Packages.roboschool spyder qradiolink rakarrack rtl_433 run-scaled runwayml salut_a_toi sasview scyther sdrangel seaview simavr simgear slic3r soapysdr-with-plugins solfege space-orbit splix ssb-patchwork standardnotes steam-run-native stuntrally system-config-printer tbe tigervnc torchat twilight urh vdrift-bin video2midi virtualgl virtualglLib welle-io winpdb xmoto xpra xscreensaver xsecurelock yoshimi zathura zynaddsubfx

@jonringer
freeglut: 3.0.0 -> 3.2.1

Verified

This commit was signed with the committer’s verified signature. The key has expired.
jonringer Jonathan Ringer
GPG key ID: 5C841D3CFDFEC4E0
Expired
Verified
Learn about vigilant mode
6a8ac41
@ofborg ofborg bot requested a review from bjornfor December 8, 2019 01:01
@bjornfor bjornfor merged commit f5ae5ca into NixOS:staging Dec 8, 2019
@jonringer jonringer deleted the bump-freeglut branch December 8, 2019 18:09
@barryfm
Copy link
Contributor

barryfm commented Dec 19, 2019

The freeglut-3.2.1 setup does not produce a lib/pkgconfig/freeglut.pc file, only a glut.pc. However,
packages like Haskell's GLUT seem to require it. Should there be a:

postFixup = ''
ln -s glut.pc $dev/lib/pkgconfig/freeglut.pc
'';

@bjornfor
Copy link
Contributor

Sounds like an upstream issue to me, between Haskell's GLUT and freeglut.

nh2 referenced this pull request Dec 20, 2019
@bennofs
haskell/GLUT: fix "unkown GLUT entry glutInit"
2228100 
This fixes #17547
@nh2
Copy link
Contributor

nh2 commented Dec 20, 2019

The freeglut-3.2.1 setup does not produce a lib/pkgconfig/freeglut.pc file, only a glut.pc. However,
packages like Haskell's GLUT seem to require it

I also just found this, using the community-sponsored static-haskell-nix CI server (yey).

The freeglut name is patched in by nixpkgs:

nixpkgs/pkgs/development/haskell-modules/patches/GLUT.patch

Line 9 in e46abc6

+ pkgconfig-depends: freeglut

Since here: 2228100#commitcomment-36514552

I'll make a PR to fix it.

nh2 added a commit to nh2/nixpkgs that referenced this pull request Dec 20, 2019
@nh2
haskellPackages.GLUT: Fix freeglut.pc -> glut.pc.
4bf23ce 
This was broken by PR NixOS#70235 with commit

    f5ae5ca - freeglut: 3.0.0 -> 3.2.1

The in the newer freeglut version, the pkg-config file is called
`glut.pc`, no longer `freeglut.pc`.

Found in:

    NixOS#70235 (comment)
@nh2 nh2 mentioned this pull request Dec 20, 2019
Merged
10 tasks
@nh2
Copy link
Contributor

nh2 commented Dec 20, 2019

PR: #76073

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314

@FRidh FRidh

@matthewbauer matthewbauer

@ttuegel ttuegel

@bjornfor bjornfor

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jonringer @bjornfor @barryfm @nh2